Merge "Do not turn on Bluetooth when booting into Safe Mode"

2019-07-23 06:34:17 +00:00
parent 935d8032c8 79e0bf6c22
commit 34ed823dae
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -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.");
            }