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

Commit 0dd89590 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

resolve merge conflicts of b8fdf0aa to master 

Change-Id: Iee1e2229317084563d22a5cfc6e3a17ccc612bb1
parents 8f73ad37 b8fdf0aa

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

+10 −6
Original line number Diff line number Diff line
@@ -594,12 +594,14 @@ public final class SystemServer { 
                false);

        boolean disableTrustManager = SystemProperties.getBoolean("config.disable_trustmanager",

                false);

        boolean disableTextServices = SystemProperties.getBoolean("config.disable_textservices", false);

        boolean disableTextServices = SystemProperties.getBoolean("config.disable_textservices",

                false);

        boolean disableSamplingProfiler = SystemProperties.getBoolean("config.disable_samplingprof",

                false);



        boolean disableConsumerIr = SystemProperties.getBoolean("config.disable_consumerir", false);

        boolean disableVrManager = SystemProperties.getBoolean("config.disable_vrmanager", false);

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

                false);



        boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
@@ -633,10 +635,12 @@ public final class SystemServer { 


            mContentResolver = context.getContentResolver();



            if (!disableCameraService) {

                Slog.i(TAG, "Camera Service");

                traceBeginAndSlog("StartCameraService");

                mSystemServiceManager.startService(CameraService.class);

                traceEnd();

            }



            // The AccountManager must come before the ContentService

            traceBeginAndSlog("StartAccountManagerService");