commit 03d0a367cf8b229c12e51dc5f452deb710093b20
author Wei Liu <luciferleo@google.com> Tue Sep 20 10:21:27 2016 -0700
committer Wei Liu <luciferleo@google.com> Tue Sep 20 10:25:51 2016 -0700
tree eec57799a02ba86792f370f45a5bea8488d03b33
parent f97de8b1c5f21fa98cd145c35091e69eb15c28e0
parent 82d5fc17b5f19b1fcd4533beb489b35b7ff58606

resolve merge conflicts of 82d5fc1 to master

Test: device boots

Change-Id: I78e5667577e413763b6be3b06a2feda99ef0d739

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 c5e2840..133af3e 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -593,6 +593,7 @@
                 false);
 
         boolean disableConsumerIr = SystemProperties.getBoolean("config.disable_consumerir", false);
+        boolean disableVrManager = SystemProperties.getBoolean("config.disable_vrmanager", false);
 
         boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
 
@@ -677,9 +678,11 @@
             ServiceManager.addService(Context.INPUT_SERVICE, inputManager);
             traceEnd();
 
-            traceBeginAndSlog("StartVrManagerService");
-            mSystemServiceManager.startService(VrManagerService.class);
-            traceEnd();
+            if (!disableVrManager) {
+                traceBeginAndSlog("StartVrManagerService");
+                mSystemServiceManager.startService(VrManagerService.class);
+                traceEnd();
+            }
 
             mActivityManagerService.setWindowManager(wm);