resolve merge conflicts of 82d5fc1 to master
Test: device boots
Change-Id: I78e5667577e413763b6be3b06a2feda99ef0d739
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);