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

Commit 3eed5065 authored by Ugo Yu's avatar Ugo Yu Committed by Automerger Merge Worker
Browse files

Merge "Fix Bluetooth auto turns ON in airplane mode" into rvc-dev am: 88a25ff2 am: fd4160e8 

Change-Id: I27fba748550d568b05648079d313d905eb73f103
parents 9e3d580d fd4160e8

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

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