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

Commit 7af8c2a8 authored by Colin Cross's avatar Colin Cross
Browse files

resolve merge conflicts of 15de376b to master 

Change-Id: Id76c6ef0a592fde8ee0f6fef0d1e9352aa21c9fe
parents 2079ac87 15de376b

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