From 79e0bf6c22eb0c0487c16ae814fbc4d27071ec7b Mon Sep 17 00:00:00 2001
From: Zongheng Wang <wangzongheng@google.com>
Date: Mon, 8 Jul 2019 15:22:04 -0700
Subject: 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index 223eb552f832..89b59cf4a734 100644
--- 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.");
             }
-- 
cgit v1.2.3-59-g8ed1b