commit 3d622b70169cedaa9eb4ffaebe5ec1b9934fecb1
author Hayden Gomes <haydengomes@google.com> Wed May 15 14:17:24 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 15 14:17:24 2019 +0000
tree 3a5de529e9c4483c53675f34f8c7f416526a323f
parent b3196e53d7bb17745526ab3c6821a57784d2bf7c
parent 013a7f8dce200e44f010435072a4e89433c61f9b

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

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 2b5cd01..e42ed3b 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1049,12 +1049,7 @@
             mDisplayManagerService.windowManagerAndInputReady();
             traceEnd();
 
-            // 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) {
+            if (mFactoryTestMode == FactoryTest.FACTORY_TEST_LOW_LEVEL) {
                 Slog.i(TAG, "No Bluetooth Service (factory test)");
             } else if (!context.getPackageManager().hasSystemFeature
                     (PackageManager.FEATURE_BLUETOOTH)) {