commit 79e0bf6c22eb0c0487c16ae814fbc4d27071ec7b
author Zongheng Wang <wangzongheng@google.com> Mon Jul 08 15:22:04 2019 -0700
committer Zongheng Wang <wangzongheng@google.com> Thu Jul 18 02:21:20 2019 +0000
tree 215e9ba5ba318d966ab73e79a7f2b37325c84987
parent 79a2b5215d363cd7ea80660c5f27cefceec92426

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

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

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index 223eb55..89b59cf 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -1142,7 +1142,8 @@
         if (isBluetoothDisallowed) {
             return;
         }
-        if (mEnableExternal && isBluetoothPersistedStateOnBluetooth()) {
+        final boolean isSafeMode = mContext.getPackageManager().isSafeMode();
+        if (mEnableExternal && isBluetoothPersistedStateOnBluetooth() && !isSafeMode) {
             if (DBG) {
                 Slog.d(TAG, "Auto-enabling Bluetooth.");
             }