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

Commit b2de288c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6554163 from 734934aa6352311694f103c24ae9c8ae3ef48bb4 to mainline-release

Change-Id: Ibd563a89b7edf28ac2fb0d3a46d27061829710f9
parents b335a77e 01252f4b
Loading
Loading
Loading
Loading
+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()) {