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

Merge "Remove outdated emulator check which causes BT to not start" am: ad7fb62d4f

Browse Source 
am: 806ac5e1dd

Change-Id: I05b90b0f77fa74268f2f92bfa2e4decec3af5745
This commit is contained in:
Pulkit Bhuwalka
2017-02-17 23:32:37 +00:00
committed by android-build-merger
parent e86b78a574 806ac5e1dd
commit a110feee4c
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -563,8 +563,6 @@ public final class SystemServer {
boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice", boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",
false); false);
boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
try { try {
Slog.i(TAG, "Reading configuration..."); Slog.i(TAG, "Reading configuration...");
SystemConfig.getInstance(); SystemConfig.getInstance();
@@ -651,12 +649,7 @@ public final class SystemServer {
// TODO: Use service dependencies instead. // TODO: Use service dependencies instead.
mDisplayManagerService.windowManagerAndInputReady(); mDisplayManagerService.windowManagerAndInputReady();
// 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)) {