diff options
| author | 2017-02-17 20:12:29 -0800 | |
|---|---|---|
| committer | 2017-02-17 20:13:31 -0800 | |
| commit | 705cbc684abb83ba976fe8b43b19ee8acee77dee (patch) | |
| tree | 99e86a88b0f0249689a1a693de0137e57f67e7da | |
| parent | 28f99293f74555592af2342095d23be51cbc1b8b (diff) | |
| parent | a110feee4cac9d28c213010f325ee95560c8c471 (diff) | |
resolve merge conflicts of a110feee4cac to master
Test: Resolved merge conflict. Built locally.
Change-Id: If8e439d513ac2242b82f67a4c68bc3adfabe2b9c
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 79176444b77a..4352791dab21 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -682,8 +682,6 @@ public final class SystemServer { 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(); @@ -810,12 +808,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)) { |