25Q1 flag removal: get_state_from_system_server

Bug: 362569584
Fix: 362569584
Flag: com.android.bluetooth.flags.get_state_from_system_server
Test: m com.android.bt
Change-Id: I0156a3a4f7f60e4c1c44cb9245c52946e21f568c

4 files changed, 3 insertions, 36 deletions

diff --git a/service/src/AdapterState.kt b/service/src/AdapterState.kt
index ac52185c89..ef6900975e 100644
--- a/service/src/AdapterState.kt
+++ b/service/src/AdapterState.kt
@@ -20,7 +20,6 @@ import android.bluetooth.BluetoothAdapter.STATE_OFF
 import android.bluetooth.IBluetoothManager.GET_SYSTEM_STATE_API
 import android.bluetooth.IBluetoothManager.IPC_CACHE_MODULE_SYSTEM
 import android.os.IpcDataCache
-import com.android.bluetooth.flags.Flags
 import kotlin.time.Duration
 import kotlin.time.toKotlinDuration
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -40,9 +39,7 @@ class BluetoothAdapterState {
 
     fun set(s: Int) = runBlocking {
         _uiState.emit(s)
-        if (Flags.getStateFromSystemServer()) {
-            IpcDataCache.invalidateCache(IPC_CACHE_MODULE_SYSTEM, GET_SYSTEM_STATE_API)
-        }
+        IpcDataCache.invalidateCache(IPC_CACHE_MODULE_SYSTEM, GET_SYSTEM_STATE_API)
     }
 
     fun get(): Int = _uiState.replayCache.get(0)
diff --git a/service/src/airplane/ModeListenerTest.kt b/service/src/airplane/ModeListenerTest.kt
index b455b1122d..50f7f06a5c 100644
--- a/service/src/airplane/ModeListenerTest.kt
+++ b/service/src/airplane/ModeListenerTest.kt
@@ -26,7 +26,6 @@ import android.platform.test.flag.junit.FlagsParameterization
 import android.platform.test.flag.junit.SetFlagsRule
 import android.provider.Settings
 import androidx.test.core.app.ApplicationProvider
-import com.android.bluetooth.flags.Flags
 import com.android.server.bluetooth.BluetoothAdapterState
 import com.android.server.bluetooth.Log
 import com.android.server.bluetooth.airplane.APM_BT_ENABLED_NOTIFICATION
@@ -63,14 +62,13 @@ class ModeListenerTest(flags: FlagsParameterization) {
     companion object {
         @JvmStatic
         @Parameters(name = "{0}")
-        fun getParams() =
-            FlagsParameterization.allCombinationsOf(Flags.FLAG_GET_STATE_FROM_SYSTEM_SERVER)
+        fun getParams() = FlagsParameterization.allCombinationsOf()
 
         internal fun setupAirplaneModeToOn(
             resolver: ContentResolver,
             looper: Looper,
             user: () -> Context,
-            enableEnhancedMode: Boolean
+            enableEnhancedMode: Boolean,
         ) {
             enableSensitive(resolver, looper, Settings.Global.AIRPLANE_MODE_RADIOS)
             enableMode(resolver, looper, Settings.Global.AIRPLANE_MODE_ON)
diff --git a/service/src/com/android/server/bluetooth/BluetoothServiceBinder.java b/service/src/com/android/server/bluetooth/BluetoothServiceBinder.java
index bb0e951d96..99759d764d 100644
--- a/service/src/com/android/server/bluetooth/BluetoothServiceBinder.java
+++ b/service/src/com/android/server/bluetooth/BluetoothServiceBinder.java
@@ -44,8 +44,6 @@ import android.permission.PermissionManager;
 
 import androidx.annotation.RequiresApi;
 
-import com.android.bluetooth.flags.Flags;
-
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 
@@ -170,15 +168,6 @@ class BluetoothServiceBinder extends IBluetoothManager.Stub {
 
     @Override
     public int getState() {
-        if (Flags.getStateFromSystemServer()) {
-            return mBluetoothManagerService.getState();
-        }
-        if (!isCallerSystem(getCallingAppId())
-                && !mPermissionUtils.checkIfCallerIsForegroundUser(mUserManager)) {
-            Log.w(TAG, "getState(): UNAUTHORIZED. Report OFF for non-active and non system user");
-            return BluetoothAdapter.STATE_OFF;
-        }
-
         return mBluetoothManagerService.getState();
     }
 
diff --git a/service/tests/src/com/android/server/bluetooth/BluetoothServiceBinderTest.java b/service/tests/src/com/android/server/bluetooth/BluetoothServiceBinderTest.java
index ec4abca34f..7ef4ec8887 100644
--- a/service/tests/src/com/android/server/bluetooth/BluetoothServiceBinderTest.java
+++ b/service/tests/src/com/android/server/bluetooth/BluetoothServiceBinderTest.java
@@ -49,16 +49,12 @@ import android.content.ContextWrapper;
 import android.os.IBinder;
 import android.os.Process;
 import android.os.UserManager;
-import android.platform.test.annotations.DisableFlags;
-import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 
 import androidx.test.filters.SmallTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.bluetooth.flags.Flags;
-
 import libcore.junit.util.compat.CoreCompatChangeRule.DisableCompatChanges;
 import libcore.junit.util.compat.CoreCompatChangeRule.EnableCompatChanges;
 
@@ -226,19 +222,6 @@ public class BluetoothServiceBinderTest {
     }
 
     @Test
-    @DisableFlags(Flags.FLAG_GET_STATE_FROM_SYSTEM_SERVER)
-    public void getState() {
-        // TODO(b/280518177): add more test from not System / ...
-        // TODO(b/280518177): add more test when caller is not in foreground
-
-        mBinder.getState();
-        verify(mManagerService).getState();
-        verify(mUserManager).getProfileParent(any());
-        verifyMock();
-    }
-
-    @Test
-    @EnableFlags(Flags.FLAG_GET_STATE_FROM_SYSTEM_SERVER)
     public void getStateFromSystemServer() {
         mBinder.getState();
         verify(mManagerService).getState();