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

Commit fa10c286 authored by Ivan Podogov's avatar Ivan Podogov Committed by Android (Google) Code Review
Browse files

Merge "Add property to disable camera service proxy." into cw-f-dev

parents c1b1be6b 8adaec07

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

+8 −4
Original line number Diff line number Diff line
@@ -549,12 +549,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");
@@ -579,8 +581,10 @@ public final class SystemServer { 


            mContentResolver = context.getContentResolver();



            if (!disableCameraService) {

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

                mSystemServiceManager.startService(CameraService.class);

            }



            // The AccountManager must come before the ContentService

            traceBeginAndSlog("StartAccountManagerService");