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

Commit b1c820ed authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of a110feee to master"

parents 0991eb2f 705cbc68

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

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