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

Merge "Revert "Remove outdated emulator check which causes BT to not start""

Browse Source 
am: 375ea2ae71

Change-Id: I3d5abc52abf3f7c01ba4fbee47d7e487e99f5dda
This commit is contained in:
Colin Cross
2017-02-21 23:32:32 +00:00
committed by android-build-merger
parent 50bc658e20 375ea2ae71
commit ebc05de919
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -563,6 +563,8 @@ public final class SystemServer {
boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",
false);
boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
try {
Slog.i(TAG, "Reading configuration...");
SystemConfig.getInstance();
@@ -649,7 +651,12 @@ public final class SystemServer {
// TODO: Use service dependencies instead.
mDisplayManagerService.windowManagerAndInputReady();
if (mFactoryTestMode == FactoryTest.FACTORY_TEST_LOW_LEVEL) {
// Skip Bluetooth if we have an emulator kernel
// 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)");
} else if (!context.getPackageManager().hasSystemFeature
(PackageManager.FEATURE_BLUETOOTH)) {