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

Commit 4b6e138c 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: 1b9f4dbd 

Change-Id: I65735852f5f057e920c6b26980a253326c6a89bb
parents 954479e6 1b9f4dbd

services/core/java/com/android/server/BluetoothManagerService.java

+7 −0
Original line number Diff line number Diff line
@@ -888,6 +888,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();