commit 0dd895901e4f31c6c1b10b48a786c57a9fa2d877
author Andreas Gampe <agampe@google.com> Sun Sep 25 13:38:46 2016 -0700
committer Andreas Gampe <agampe@google.com> Sun Sep 25 13:51:50 2016 -0700
tree 85e0a9efa0c62b0cdda7c66fd3b3bc7468fea02f
parent 8f73ad371710d670729c7917a183b5ee9c0855bb
parent b8fdf0aa161f57d748357fc6102538914ab0c6b4

resolve merge conflicts of b8fdf0a to master

Change-Id: Iee1e2229317084563d22a5cfc6e3a17ccc612bb1

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

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 03fb3ac..e316328 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -594,12 +594,14 @@
                 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 @@
 
             mContentResolver = context.getContentResolver();
 
-            Slog.i(TAG, "Camera Service");
-            traceBeginAndSlog("StartCameraService");
-            mSystemServiceManager.startService(CameraService.class);
-            traceEnd();
+            if (!disableCameraService) {
+                Slog.i(TAG, "Camera Service");
+                traceBeginAndSlog("StartCameraService");
+                mSystemServiceManager.startService(CameraService.class);
+                traceEnd();
+            }
 
             // The AccountManager must come before the ContentService
             traceBeginAndSlog("StartAccountManagerService");