Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7de296f8 authored by Hayden Gomes's avatar Hayden Gomes Committed by android-build-merger
Browse files

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

am: 3d622b70

Change-Id: Ibb4933f43657aaebd096850ba906016a237d1bb3
parents 9b87c5f6 3d622b70

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

+1 −6
Original line number Diff line number Diff line
@@ -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)) {