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

Commit 705cbc68 authored by Pulkit Bhuwalka's avatar Pulkit Bhuwalka
Browse files

resolve merge conflicts of a110feee to master 

Test: Resolved merge conflict. Built locally.

Change-Id: If8e439d513ac2242b82f67a4c68bc3adfabe2b9c
parents 28f99293 a110feee

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

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

        boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",

                false);

                false);





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



        // For debugging RescueParty

        // For debugging RescueParty

        if (Build.IS_DEBUGGABLE && SystemProperties.getBoolean("debug.crash_system", false)) {

        if (Build.IS_DEBUGGABLE && SystemProperties.getBoolean("debug.crash_system", false)) {

            throw new RuntimeException();

            throw new RuntimeException();
@@ -810,12 +808,7 @@ public final class SystemServer { 
            mDisplayManagerService.windowManagerAndInputReady();

            mDisplayManagerService.windowManagerAndInputReady();

            traceEnd();

            traceEnd();





            // Skip Bluetooth if we have an emulator kernel

            if (mFactoryTestMode == FactoryTest.FACTORY_TEST_LOW_LEVEL) {

            // 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)");

                Slog.i(TAG, "No Bluetooth Service (factory test)");

            } else if (!context.getPackageManager().hasSystemFeature

            } else if (!context.getPackageManager().hasSystemFeature

                       (PackageManager.FEATURE_BLUETOOTH)) {

                       (PackageManager.FEATURE_BLUETOOTH)) {