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

Commit 79e0bf6c authored by Zongheng Wang's avatar Zongheng Wang
Browse files

Do not turn on Bluetooth when booting into Safe Mode 

Bug: 122691743
Test: Boot into Safe Mode and Bluetooth is not turned on.
Change-Id: I653b2f58c462631e9c4cc868c4ec1932ff907999
parent 79a2b521

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

+2 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        if (isBluetoothDisallowed) {

            return;

        }

        if (mEnableExternal && isBluetoothPersistedStateOnBluetooth()) {

        final boolean isSafeMode = mContext.getPackageManager().isSafeMode();

        if (mEnableExternal && isBluetoothPersistedStateOnBluetooth() && !isSafeMode) {

            if (DBG) {

                Slog.d(TAG, "Auto-enabling Bluetooth.");

            }