Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 34ed823dae

Change-Id: Ib4246192ed3f854a94a33d972616d6b1d9de5d9c
This commit is contained in:
Zongheng Wang
2019-07-22 23:57:35 -07:00
committed by android-build-merger
parent 15e24878d6 34ed823dae
commit 8ae1de7afe
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -1185,7 +1185,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
if (isBluetoothDisallowed) { if (isBluetoothDisallowed) {
return; return;
} }
if (mEnableExternal && isBluetoothPersistedStateOnBluetooth()) { final boolean isSafeMode = mContext.getPackageManager().isSafeMode();
if (mEnableExternal && isBluetoothPersistedStateOnBluetooth() && !isSafeMode) {
if (DBG) { if (DBG) {
Slog.d(TAG, "Auto-enabling Bluetooth."); Slog.d(TAG, "Auto-enabling Bluetooth.");
} }