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
This commit is contained in:
Treehugger Robot
2019-07-23 06:34:17 +00:00
committed by Gerrit Code Review
parent 935d8032c8 79e0bf6c22
commit 34ed823dae
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

@@ -1142,7 +1142,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.");
} }