commit 7af8c2a8b97fec0a54cb3555fe5907b17091cfbb
author Colin Cross <ccross@android.com> Mon Sep 12 21:12:49 2016 -0700
committer Colin Cross <ccross@android.com> Mon Sep 12 21:12:49 2016 -0700
tree 35af425b3f87e04e5e84a534b62cfe611d7c62a9
parent 2079ac87793544e3a7282f1b923792d709601cff
parent 15de376b90d37a1502c28e5e0b3a90702dfbc85f

resolve merge conflicts of 15de376 to master

Change-Id: Id76c6ef0a592fde8ee0f6fef0d1e9352aa21c9fe

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 4591fcc..c5e2840 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -591,6 +591,9 @@
         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 isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
 
         try {
@@ -646,10 +649,12 @@
             ServiceManager.addService("vibrator", vibrator);
             traceEnd();
 
-            traceBeginAndSlog("StartConsumerIrService");
-            consumerIr = new ConsumerIrService(context);
-            ServiceManager.addService(Context.CONSUMER_IR_SERVICE, consumerIr);
-            traceEnd();
+            if (!disableConsumerIr) {
+                traceBeginAndSlog("StartConsumerIrService");
+                consumerIr = new ConsumerIrService(context);
+                ServiceManager.addService(Context.CONSUMER_IR_SERVICE, consumerIr);
+                traceEnd();
+            }
 
             traceBeginAndSlog("StartAlarmManagerService");
             mSystemServiceManager.startService(AlarmManagerService.class);