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

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

Merge "Fix Bluetooth auto turns ON in airplane mode" am: bc501515 am: 5948e313 

Change-Id: I41af1f44974fd22f78326c6d2313f9c7e7a61817
parents 8a3a0629 5948e313

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

+7 −0
Original line number Diff line number Diff line
@@ -929,6 +929,13 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                Slog.e(TAG, "onBluetoothServiceUp: mBluetooth is null!");

                return;

            }

            if (!mEnableExternal && !isBleAppPresent() && isAirplaneModeOn()) {

                // Airplane mode is turned on while enabling BLE only mode, disable

                // BLE now.

                disableBleScanMode();

                sendBrEdrDownCallback();

                return;

            }

            if (isBluetoothPersistedStateOnBluetooth() || !isBleAppPresent()) {

                // This triggers transition to STATE_ON

                mBluetooth.onLeServiceUp();