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

Commit 1ec73b23 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Corrected comment on when BT is not disabled on entering airplane mode." am: 80dbb106 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1916077

Change-Id: Ia8b880bf0220f915214ce98b3d55e04d65bf416a
parents adde0560 80dbb106

service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -112,9 +112,9 @@ class BluetoothAirplaneModeListener { 
    void handleAirplaneModeChange() {

    void handleAirplaneModeChange() {

        if (shouldSkipAirplaneModeChange()) {

        if (shouldSkipAirplaneModeChange()) {

            Log.i(TAG, "Ignore airplane mode change");

            Log.i(TAG, "Ignore airplane mode change");

            // We have to store Bluetooth state here, so if user turns off Bluetooth

            // Airplane mode enabled when Bluetooth is being used for audio/headering aid.

            // after airplane mode is turned on, we don't forget to turn on Bluetooth

            // Bluetooth is not disabled in such case, only state is changed to

            // when airplane mode turns off.

            // BLUETOOTH_ON_AIRPLANE mode.

            mAirplaneHelper.setSettingsInt(Settings.Global.BLUETOOTH_ON,

            mAirplaneHelper.setSettingsInt(Settings.Global.BLUETOOTH_ON,

                    BluetoothManagerService.BLUETOOTH_ON_AIRPLANE);

                    BluetoothManagerService.BLUETOOTH_ON_AIRPLANE);

            if (shouldPopToast()) {

            if (shouldPopToast()) {