Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9decbdd authored by Wei Liu's avatar Wei Liu Committed by Android (Google) Code Review
Browse files

Merge "Make consumer_ir an optional service." into cw-f-dev

parents 0fb8f5f4 09de4195

services/java/com/android/server/SystemServer.java

+9 −4
Original line number Diff line number Diff line
@@ -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);



            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);