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

Commit 5ef2816a 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: 88a25ff248 am: fd4160e8ce am: 8159fa69 am: 1bfa388a

Change-Id: Id5971923e5b4039a7b4d2d4cf3aa84a0d93cb292
parents 472b1eb1 1bfa388a
Loading
Loading
Loading
Loading
+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();