Airplane mode rename isOn to isOnOverrode

Also inline the method in the managerService

Bug: 337966092
Test: atest ServiceBluetoothRoboTests
Flag: Exempt, this is renaming the method only
Change-Id: If5b59f9547bfc6ae0cf68f0f67c5a387426108fc

5 files changed, 48 insertions, 53 deletions

diff --git a/service/src/AutoOnFeature.kt b/service/src/AutoOnFeature.kt
index e8c96c589c..6181e3df6c 100644
--- a/service/src/AutoOnFeature.kt
+++ b/service/src/AutoOnFeature.kt
@@ -39,7 +39,7 @@ import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import com.android.modules.expresslog.Counter
 import com.android.server.bluetooth.airplane.hasUserToggledApm as hasUserToggledApm
-import com.android.server.bluetooth.airplane.isOn as isAirplaneModeOn
+import com.android.server.bluetooth.airplane.isOnOverrode as isAirplaneModeOn
 import com.android.server.bluetooth.satellite.isOn as isSatelliteModeOn
 import java.time.LocalDateTime
 import java.time.LocalTime
diff --git a/service/src/AutoOnFeatureTest.kt b/service/src/AutoOnFeatureTest.kt
index 4a490c2119..13febe228b 100644
--- a/service/src/AutoOnFeatureTest.kt
+++ b/service/src/AutoOnFeatureTest.kt
@@ -28,7 +28,7 @@ import com.android.server.bluetooth.BluetoothAdapterState
 import com.android.server.bluetooth.Log
 import com.android.server.bluetooth.Timer
 import com.android.server.bluetooth.USER_SETTINGS_KEY
-import com.android.server.bluetooth.airplane.isOn as isAirplaneModeOn
+import com.android.server.bluetooth.airplane.isOnOverrode as isAirplaneModeOn
 import com.android.server.bluetooth.airplane.test.ModeListenerTest as AirplaneListener
 import com.android.server.bluetooth.isUserEnabled
 import com.android.server.bluetooth.isUserSupported
diff --git a/service/src/airplane/ModeListener.kt b/service/src/airplane/ModeListener.kt
index 2d92e6c1c6..5812304124 100644
--- a/service/src/airplane/ModeListener.kt
+++ b/service/src/airplane/ModeListener.kt
@@ -36,8 +36,8 @@ import kotlin.time.TimeSource
 
 private const val TAG = "AirplaneModeListener"
 
-/** @return true if Bluetooth state is impacted by airplane mode */
-public var isOn = false
+/** @return true if Bluetooth state is currently impacted by airplane mode */
+public var isOnOverrode = false
     private set
 
 /**
@@ -80,11 +80,11 @@ public fun initialize(
             Settings.Global.AIRPLANE_MODE_RADIOS,
             Settings.Global.AIRPLANE_MODE_ON,
             fun(newMode: Boolean) {
-                val previousMode = isOn
+                val previousMode = isOnOverrode
                 val isBluetoothOn = state.oneOf(STATE_ON, STATE_TURNING_ON, STATE_TURNING_OFF)
                 val isMediaConnected = isBluetoothOn && mediaCallback()
 
-                isOn =
+                isOnOverrode =
                     airplaneModeValueOverride(
                         systemResolver,
                         newMode,
@@ -103,17 +103,17 @@ public fun initialize(
                     timeSource.markNow(),
                 )
 
-                if (previousMode == isOn) {
-                    Log.d(TAG, "Ignore airplane mode change because is already: $isOn")
+                if (previousMode == isOnOverrode) {
+                    Log.d(TAG, "Ignore airplane mode change because is already: $isOnOverrode")
                     return
                 }
 
-                Log.i(TAG, "Trigger callback with state: $isOn")
-                modeCallback(isOn)
+                Log.i(TAG, "Trigger callback with state: $isOnOverrode")
+                modeCallback(isOnOverrode)
             }
         )
 
-    isOn =
+    isOnOverrode =
         airplaneModeValueOverride(
             systemResolver,
             airplaneModeAtBoot,
@@ -132,7 +132,7 @@ public fun initialize(
         false,
         timeSource.markNow(),
     )
-    Log.i(TAG, "Initialized successfully with state: $isOn")
+    Log.i(TAG, "Initialized successfully with state: $isOnOverrode")
 }
 
 @kotlin.time.ExperimentalTime
@@ -263,7 +263,7 @@ private class AirplaneMetricSession(
         }
     }
 
-    private val isBluetoothOnAfterApmToggle = !isOn
+    private val isBluetoothOnAfterApmToggle = !isOnOverrode
     private var userToggledBluetoothDuringApm = false
     private var userToggledBluetoothDuringApmWithinMinute = false
 
diff --git a/service/src/airplane/ModeListenerTest.kt b/service/src/airplane/ModeListenerTest.kt
index d0b8a31245..f7a76d72eb 100644
--- a/service/src/airplane/ModeListenerTest.kt
+++ b/service/src/airplane/ModeListenerTest.kt
@@ -34,7 +34,7 @@ import com.android.server.bluetooth.airplane.APM_WIFI_BT_NOTIFICATION
 import com.android.server.bluetooth.airplane.BLUETOOTH_APM_STATE
 import com.android.server.bluetooth.airplane.WIFI_APM_STATE
 import com.android.server.bluetooth.airplane.initialize
-import com.android.server.bluetooth.airplane.isOn
+import com.android.server.bluetooth.airplane.isOnOverrode
 import com.android.server.bluetooth.airplane.notifyUserToggledBluetooth
 import com.android.server.bluetooth.test.disableMode
 import com.android.server.bluetooth.test.disableSensitive
@@ -159,7 +159,7 @@ class ModeListenerTest {
 
         initializeAirplane()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
     }
 
@@ -170,7 +170,7 @@ class ModeListenerTest {
 
         initializeAirplane()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
     }
 
@@ -183,7 +183,7 @@ class ModeListenerTest {
 
         enableMode()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
     }
 
@@ -191,23 +191,23 @@ class ModeListenerTest {
     fun initialize_whenSensitive_isOff() {
         initializeAirplane()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
     }
 
     @Test
-    fun initialize_whenSensitive_isOn() {
+    fun initialize_whenSensitive_isOnOverrode() {
         enableSensitive()
         enableMode()
 
         initializeAirplane()
 
-        assertThat(isOn).isTrue()
+        assertThat(isOnOverrode).isTrue()
         assertThat(mode).isEmpty()
     }
 
     @Test
-    fun initialize_whenApmToggled_isOn() {
+    fun initialize_whenApmToggled_isOnOverrode() {
         enableSensitive()
         enableMode()
         Settings.Secure.putInt(userContext.contentResolver, APM_USER_TOGGLED_BLUETOOTH, 1)
@@ -215,12 +215,12 @@ class ModeListenerTest {
 
         initializeAirplane()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
     }
 
     @Test
-    fun toggleSensitive_whenEnabled_isOnOffOn() {
+    fun toggleSensitive_whenEnabled_isOnOverrode() {
         enableSensitive()
         enableMode()
 
@@ -229,7 +229,7 @@ class ModeListenerTest {
         disableSensitive()
         enableSensitive()
 
-        assertThat(isOn).isTrue()
+        assertThat(isOnOverrode).isTrue()
         assertThat(mode).containsExactly(false, true)
     }
 
@@ -240,7 +240,7 @@ class ModeListenerTest {
         enableMode()
         disableMode()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).containsExactly(true, false)
     }
 
@@ -250,7 +250,7 @@ class ModeListenerTest {
 
         disableMode()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
     }
 
@@ -263,7 +263,7 @@ class ModeListenerTest {
 
         enableMode()
 
-        assertThat(isOn).isTrue()
+        assertThat(isOnOverrode).isTrue()
         assertThat(mode).isEmpty()
     }
 
@@ -274,7 +274,7 @@ class ModeListenerTest {
         disableSensitive()
         enableMode()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         // As opposed to the bare RadioModeListener, similar consecutive event are discarded
         assertThat(mode).isEmpty()
     }
@@ -287,7 +287,7 @@ class ModeListenerTest {
 
         enableMode()
 
-        assertThat(isOn).isTrue()
+        assertThat(isOnOverrode).isTrue()
         assertThat(mode).containsExactly(true)
         assertThat(ShadowToast.shownToastCount()).isEqualTo(0)
     }
@@ -301,7 +301,7 @@ class ModeListenerTest {
 
         enableMode()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
 
         assertThat(ShadowToast.shownToastCount()).isEqualTo(1)
@@ -323,7 +323,7 @@ class ModeListenerTest {
 
         enableMode()
 
-        assertThat(isOn).isTrue()
+        assertThat(isOnOverrode).isTrue()
         assertThat(mode).containsExactly(true)
     }
 
@@ -337,7 +337,7 @@ class ModeListenerTest {
 
         enableMode()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
     }
 
@@ -350,7 +350,7 @@ class ModeListenerTest {
 
         enableMode()
 
-        assertThat(isOn).isTrue()
+        assertThat(isOnOverrode).isTrue()
         assertThat(mode).containsExactly(true)
     }
 
@@ -364,7 +364,7 @@ class ModeListenerTest {
 
         enableMode()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
         assertThat(notification).containsExactly(APM_BT_NOTIFICATION)
     }
@@ -382,7 +382,7 @@ class ModeListenerTest {
 
         enableMode()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
         assertThat(notification).containsExactly(APM_WIFI_BT_NOTIFICATION)
     }
@@ -399,7 +399,7 @@ class ModeListenerTest {
 
         enableMode()
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
         assertThat(notification).containsExactly(APM_BT_NOTIFICATION)
     }
@@ -416,7 +416,7 @@ class ModeListenerTest {
             disableMode()
         }
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
         assertThat(notification).isEmpty()
 
@@ -430,7 +430,7 @@ class ModeListenerTest {
 
         notifyUserToggledBluetooth(resolver, userContext, false)
 
-        assertThat(isOn).isFalse()
+        assertThat(isOnOverrode).isFalse()
         assertThat(mode).isEmpty()
         assertThat(notification).isEmpty()
         assertThat(ShadowToast.shownToastCount()).isEqualTo(0)
@@ -444,7 +444,7 @@ class ModeListenerTest {
         enableMode()
         notifyUserToggledBluetooth(resolver, userContext, true)
 
-        assertThat(isOn).isTrue()
+        assertThat(isOnOverrode).isTrue()
         assertThat(mode).containsExactly(true)
         assertThat(notification).isEmpty()
         assertThat(ShadowToast.shownToastCount()).isEqualTo(0)
@@ -463,7 +463,7 @@ class ModeListenerTest {
         enableMode()
         notifyUserToggledBluetooth(resolver, userContext, false)
 
-        assertThat(isOn).isTrue()
+        assertThat(isOnOverrode).isTrue()
         assertThat(mode).containsExactly(true)
         assertThat(notification).isEmpty()
         assertThat(ShadowToast.shownToastCount()).isEqualTo(0)
@@ -482,7 +482,7 @@ class ModeListenerTest {
         enableMode()
         notifyUserToggledBluetooth(resolver, userContext, true)
 
-        assertThat(isOn).isTrue()
+        assertThat(isOnOverrode).isTrue()
         assertThat(mode).containsExactly(true)
         assertThat(notification).containsExactly(APM_BT_ENABLED_NOTIFICATION)
         assertThat(ShadowToast.shownToastCount()).isEqualTo(0)
@@ -502,7 +502,7 @@ class ModeListenerTest {
         notifyUserToggledBluetooth(resolver, userContext, true)
         notifyUserToggledBluetooth(resolver, userContext, false)
 
-        assertThat(isOn).isTrue()
+        assertThat(isOnOverrode).isTrue()
         assertThat(mode).containsExactly(true)
         assertThat(notification).containsExactly(APM_BT_ENABLED_NOTIFICATION)
         assertThat(ShadowToast.shownToastCount()).isEqualTo(0)
@@ -533,7 +533,7 @@ class ModeListenerTest {
         timesource += 2.minutes
         notifyUserToggledBluetooth(resolver, userContext, true)
 
-        assertThat(isOn).isTrue()
+        assertThat(isOnOverrode).isTrue()
         assertThat(mode).containsExactly(true)
         assertThat(notification).isEmpty()
         assertThat(ShadowToast.shownToastCount()).isEqualTo(0)
diff --git a/service/src/com/android/server/bluetooth/BluetoothManagerService.java b/service/src/com/android/server/bluetooth/BluetoothManagerService.java
index 7b978b143a..5654dc1723 100644
--- a/service/src/com/android/server/bluetooth/BluetoothManagerService.java
+++ b/service/src/com/android/server/bluetooth/BluetoothManagerService.java
@@ -390,7 +390,7 @@ class BluetoothManagerService {
                 TAG,
                 ("delayModeChangedIfNeeded(" + modechanged + "):")
                         + (" state=" + BluetoothAdapter.nameForState(state))
-                        + (" isAirplaneModeOn()=" + isAirplaneModeOn())
+                        + (" Airplane.isOnOverrode=" + AirplaneModeListener.isOnOverrode())
                         + (" isSatelliteModeOn()=" + isSatelliteModeOn())
                         + (" delayed=" + delayMs + "ms"));
 
@@ -537,7 +537,7 @@ class BluetoothManagerService {
             return false;
         }
 
-        if (isAirplaneModeOn() && isBluetoothPersistedStateOnAirplane()) {
+        if (AirplaneModeListener.isOnOverrode() && isBluetoothPersistedStateOnAirplane()) {
             Log.d(TAG, "shouldBluetoothBeOn: BT should be off as airplaneMode is on.");
             return false;
         }
@@ -705,11 +705,6 @@ class BluetoothManagerService {
         return mBinder;
     }
 
-    /** Returns true if airplane mode is currently on */
-    private boolean isAirplaneModeOn() {
-        return AirplaneModeListener.isOn();
-    }
-
     /** Returns true if satellite mode is turned on. */
     private boolean isSatelliteModeOn() {
         return SatelliteModeListener.isOn();
@@ -879,7 +874,7 @@ class BluetoothManagerService {
     }
 
     boolean isBleScanAlwaysAvailable() {
-        if (isAirplaneModeOn() && !mEnable) {
+        if (AirplaneModeListener.isOnOverrode() && !mEnable) {
             return false;
         }
         try {
@@ -983,7 +978,7 @@ class BluetoothManagerService {
                         + (" isBinding=" + isBinding())
                         + (" mState=" + mState));
 
-        if (isAirplaneModeOn()) {
+        if (AirplaneModeListener.isOnOverrode()) {
             Log.d(TAG, "enableBle: not enabling - Airplane mode is on");
             return false;
         }
@@ -2195,7 +2190,7 @@ class BluetoothManagerService {
         mHandler.sendEmptyMessageDelayed(MESSAGE_RESTART_BLUETOOTH_SERVICE, ERROR_RESTART_TIME_MS);
 
         if (repeatAirplaneRunnable) {
-            onAirplaneModeChanged(isAirplaneModeOn());
+            onAirplaneModeChanged(AirplaneModeListener.isOnOverrode());
         }
     }