commit 039deed1fdbb5c8c4bc394b3000fdf8da31bc0c7
author Colin Cross <ccross@android.com> Sat Feb 18 20:05:47 2017 +0000
committer Colin Cross <ccross@android.com> Sat Feb 18 13:35:45 2017 -0800
tree f0dfb09e9411a3bb41c26f7be2d4d7b017a5b2d9
parent 04215148cf3282f13c32495eb928fa27d898d876

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

This reverts commit d98a4e502165d76d05e095608da3c795bd56eafd.

Change-Id: Ibd1596584928f2aa2c799501536abc9b384d1cda

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 4352791..7917644 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -682,6 +682,8 @@
         boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",
                 false);
 
+        boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
+
         // For debugging RescueParty
         if (Build.IS_DEBUGGABLE && SystemProperties.getBoolean("debug.crash_system", false)) {
             throw new RuntimeException();
@@ -808,7 +810,12 @@
             mDisplayManagerService.windowManagerAndInputReady();
             traceEnd();
 
-            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)) {