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

Commit ebc05de9 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

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

am: 375ea2ae

Change-Id: I3d5abc52abf3f7c01ba4fbee47d7e487e99f5dda
parents 50bc658e 375ea2ae

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

+8 −1
Original line number Diff line number Diff line
@@ -563,6 +563,8 @@ public final class SystemServer { 
        boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",

                false);



        boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");



        try {

            Slog.i(TAG, "Reading configuration...");

            SystemConfig.getInstance();
@@ -649,7 +651,12 @@ public final class SystemServer { 
            // TODO: Use service dependencies instead.

            mDisplayManagerService.windowManagerAndInputReady();



            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)) {