diff options
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 2178843198c9..d878b96371d0 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -551,6 +551,9 @@ public final class SystemServer { 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 { @@ -595,10 +598,12 @@ public final class SystemServer { ServiceManager.addService("vibrator", vibrator); Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); - traceBeginAndSlog("StartConsumerIrService"); - consumerIr = new ConsumerIrService(context); - ServiceManager.addService(Context.CONSUMER_IR_SERVICE, consumerIr); - Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); + if (!disableConsumerIr) { + traceBeginAndSlog("StartConsumerIrService"); + consumerIr = new ConsumerIrService(context); + ServiceManager.addService(Context.CONSUMER_IR_SERVICE, consumerIr); + Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); + } traceBeginAndSlog("StartAlarmManagerService"); mSystemServiceManager.startService(AlarmManagerService.class); |