commit cfbf2261651abba5822b4a2e0213427b298fcb63
author Colin Cross <ccross@android.com> Tue Feb 21 23:37:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 21 23:37:01 2017 +0000
tree beaa2a85070d5bc12315e9e4b1a70916f66c5f72
parent 8e8c26e25abcaa1c025519894df08f799592e60d
parent ebc05de919ed4b33f8331b2497f448a43f336c6f

Merge "Revert "Remove outdated emulator check which causes BT to not start"" am: 375ea2ae71
am: ebc05de919

Change-Id: Id61ee53f3147d90d8fbca053633e3115b69d3065

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index fbc0759..f0d5549 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -563,6 +563,8 @@
         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 @@
             // 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)) {