From 013a7f8dce200e44f010435072a4e89433c61f9b Mon Sep 17 00:00:00 2001 From: Hayden Gomes Date: Tue, 14 May 2019 09:30:39 -0700 Subject: [PATCH] Removing emulator check for starting BluetoothService This check was intended to be removed once we had the ability to add the Bluetooth systemFeature check. Removing it now so emulator can enable bluetooth Bug: 132627197 Test: Built and ran emulator locally to confirm BTService running Change-Id: I3e0606e0e4154299e65e5f62d8a1720922d796ad --- services/java/com/android/server/SystemServer.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 2b5cd010705cb..e42ed3b031399 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1049,12 +1049,7 @@ public final class SystemServer { 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)) {