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

Merge "Removing emulator check for starting BluetoothService" into qt-dev

Browse Source
This commit is contained in:
Hayden Gomes
2019-05-15 14:17:24 +00:00
committed by Android (Google) Code Review
parent b3196e53d7 013a7f8dce
commit 3d622b7016
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/SystemServer.java
View File

@@ -1049,12 +1049,7 @@ public final class SystemServer {
mDisplayManagerService.windowManagerAndInputReady(); mDisplayManagerService.windowManagerAndInputReady();
traceEnd(); traceEnd();
// Skip Bluetooth if we have an emulator kernel if (mFactoryTestMode == FactoryTest.FACTORY_TEST_LOW_LEVEL) {
// TODO: Use a more reliable check to see if this product should
// support Bluetooth - see bug 988521
if (isEmulator) {
Slog.i(TAG, "No Bluetooth Service (emulator)");
} else if (mFactoryTestMode == FactoryTest.FACTORY_TEST_LOW_LEVEL) {
Slog.i(TAG, "No Bluetooth Service (factory test)"); Slog.i(TAG, "No Bluetooth Service (factory test)");
} else if (!context.getPackageManager().hasSystemFeature } else if (!context.getPackageManager().hasSystemFeature
(PackageManager.FEATURE_BLUETOOTH)) { (PackageManager.FEATURE_BLUETOOTH)) {