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

Commit 88a25ff2 authored by Ugo Yu's avatar Ugo Yu Committed by Android (Google) Code Review
Browse files

Merge "Fix Bluetooth auto turns ON in airplane mode" into rvc-dev

parents dff3794c 0c69be28
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();