Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dadc89cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Airplane Listener: explicit Enhancement log" into main am: c54990fa am: 14a832dc 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3106687



Change-Id: I1e72076c2c8876f49f458161575dee06ff68fce4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a6b02f2 14a832dc

service/src/airplane/ModeListener.kt

+6 −4
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ public fun initialize( 
                    timeSource.markNow(),

                )



                val description = "isOn=$isOn, isOnOverrode=$isOnOverrode"

                val description =

                    "previousMode=$previousMode, isOn=$isOn, isOnOverrode=$isOnOverrode, isMediaConnected=$isMediaConnected"



                if (previousMode == isOnOverrode) {

                    Log.d(TAG, "Ignore mode change to same state. $description")
@@ -183,14 +184,14 @@ private fun airplaneModeValueOverride( 
    if (isApmEnhancementEnabled(resolver) && hasUserToggledApm(getUser())) {

        // … Staying on only depend on its last action in airplane mode

        if (isBluetoothOnAPM(getUser)) {

            Log.i(TAG, "Bluetooth stay on during airplane mode because of last user action")



            val isWifiOn = isWifiOnApm(resolver, getUser)

            sendAirplaneModeNotification?.invoke(

                if (isWifiOn) APM_WIFI_BT_NOTIFICATION else APM_BT_NOTIFICATION

            )

            Log.i(TAG, "Enhancement Mode: override and stays ON")

            return false

        }

        Log.i(TAG, "Enhancement Mode: override and turns OFF")

        return true

    }

    // … Else, staying on only depend on media profile being connected or not
@@ -202,10 +203,11 @@ private fun airplaneModeValueOverride( 
    //           3. User turns airplane off, stops media and toggles airplane back on

    //       Should we turn Bt off like asked initially ? Or keep it `on` like the toggle ?

    if (isMediaConnected) {

        Log.i(TAG, "Bluetooth stay on during airplane mode because media profile are connected")

        Log.i(TAG, "Legacy Mode: override and stays ON since media profile are connected")

        ToastNotification.displayIfNeeded(resolver, getUser)

        return false

    }

    Log.i(TAG, "Legacy Mode: no override, turns OFF")

    return true

}