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

Commit a3b2212e authored by Colin Cross's avatar Colin Cross
Browse files

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

This reverts commit d98a4e50.

Merged-In: Ibd1596584928f2aa2c799501536abc9b384d1cda
Change-Id: Ibd1596584928f2aa2c799501536abc9b384d1cda
parent d98a4e50

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

+8 −1
Original line number Diff line number Diff line
@@ -557,6 +557,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();
@@ -643,7 +645,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)) {