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

Commit 14e52de0 authored by Zongheng Wang's avatar Zongheng Wang Committed by android-build-merger
Browse files

Merge "Do not turn on Bluetooth when booting into Safe Mode" am: 34ed823dae... 

Merge "Do not turn on Bluetooth when booting into Safe Mode" am: 34ed823dae am: baf6b960 am: 121bafc53e
am: cd16c9f7

Change-Id: Iccfe6a6854f9e22cdc5a5bcdafc4529116bc88bf
parents f1a5389e cd16c9f7

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -1185,7 +1185,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.");

            }