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

Commit 8adaec07 authored by Ivan Podogov's avatar Ivan Podogov
Browse files

Add property to disable camera service proxy. 

This service proxy (together with the native server) are not needed on
Android Wear, as we don't have any watches with cameras.

Bug: 28560707
Change-Id: Ie4a830a3ba48c90d3e968fc5cdf57ccafcc1f5d8
parent a7de0e1f

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

+8 −4
Original line number Original line Diff line number Diff line
@@ -548,12 +548,14 @@ public final class SystemServer { 
                false);

                false);

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

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

                false);

                false);

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

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

                false);

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

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

                false);

                false);



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

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

        boolean disableVrManager = SystemProperties.getBoolean("config.disable_vrmanager", 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");

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




            mContentResolver = context.getContentResolver();

            mContentResolver = context.getContentResolver();





            if (!disableCameraService) {

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

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

                mSystemServiceManager.startService(CameraService.class);

                mSystemServiceManager.startService(CameraService.class);

            }





            // The AccountManager must come before the ContentService

            // The AccountManager must come before the ContentService

            traceBeginAndSlog("StartAccountManagerService");

            traceBeginAndSlog("StartAccountManagerService");