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

Commit 319cc923 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... 

Merge "Corrected comment on when BT is not disabled on entering airplane mode." am: 80dbb106 am: 1ec73b23 am: 2803708e am: 2e9a2f6c

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

Change-Id: I6e44dff44f333548a1f1e4528bc84214adb64ccc
parents 8cf67a21 2e9a2f6c

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

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

        if (shouldSkipAirplaneModeChange()) {

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

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

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

            // when airplane mode turns off.

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

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

            // BLUETOOTH_ON_AIRPLANE mode.

            mAirplaneHelper.setSettingsInt(Settings.Global.BLUETOOTH_ON,

                    BluetoothManagerService.BLUETOOTH_ON_AIRPLANE);

            if (shouldPopToast()) {