commit ef89d21a1bf9a8b11befd9b55130816ccf9fb4fb
author Wei Liu <luciferleo@google.com> Mon Sep 19 15:10:33 2016 -0700
committer Wei Liu <luciferleo@google.com> Mon Sep 19 15:18:53 2016 -0700
tree b14ca2b2056273c6658b2693a9a188b267be1d37
parent 5c90c8d620b33a150cb88d941de713e1eb32145a

Make VrManager service optional.

b/31244699

Change-Id: I7d276e6945f19b575f880df16f140b84b03052a9

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 8a59648..53117e1 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -553,6 +553,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");
 
@@ -626,9 +627,11 @@
             ServiceManager.addService(Context.INPUT_SERVICE, inputManager);
             Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
 
-            traceBeginAndSlog("StartVrManagerService");
-            mSystemServiceManager.startService(VrManagerService.class);
-            Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
+            if (!disableVrManager) {
+                traceBeginAndSlog("StartVrManagerService");
+                mSystemServiceManager.startService(VrManagerService.class);
+                Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
+            }
 
             mActivityManagerService.setWindowManager(wm);