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

Commit 3e5586b2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable Bluetooth if BLE was disabled while enabling" into rvc-dev am: 6e97539e 

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

Change-Id: I78db789d43f45a52294906a41d33bd6960d5a407
parents c3f941ef 6e97539e

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

+6 −6
Original line number Diff line number Diff line
@@ -954,7 +954,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    }



    /**

     * Call IBluetooth.onLeServiceUp() to continue if Bluetooth should be on.

     * Call IBluetooth.onLeServiceUp() to continue if Bluetooth should be on,

     * call IBluetooth.onBrEdrDown() to disable if Bluetooth should be off.

     */

    private void continueFromBleOnState() {

        if (DBG) {
@@ -966,11 +967,10 @@ 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();

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

                Slog.i(TAG, "Bluetooth was disabled while enabling BLE, disable BLE now");

                mEnable = false;

                mBluetooth.onBrEdrDown();

                return;

            }

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