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

Commit 121bafc5 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: 34ed823d 

am: 8ae1de7a

Change-Id: I42bd7eb84dedc295a69e7174210a214d2ef96700
parents 228808aa 8ae1de7a

services/core/java/com/android/server/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.");

            }