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

Commit f0c30676 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 15de376b to master"

parents 502beb5c 7af8c2a8

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

+9 −4
Original line number Diff line number Diff line
@@ -591,6 +591,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 {
@@ -646,10 +649,12 @@ public final class SystemServer { 
            ServiceManager.addService("vibrator", vibrator);

            traceEnd();



            if (!disableConsumerIr) {

                traceBeginAndSlog("StartConsumerIrService");

                consumerIr = new ConsumerIrService(context);

                ServiceManager.addService(Context.CONSUMER_IR_SERVICE, consumerIr);

                traceEnd();

            }



            traceBeginAndSlog("StartAlarmManagerService");

            mSystemServiceManager.startService(AlarmManagerService.class);