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

Commit fc71824e 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:... 

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

Change-Id: I39fdb4bf3c36ee979a9c314fc9741498d2706d3a
parents 38d831ca 5c2a8c59

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();