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

Commit 7e69b0a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE Fix CEC read Global Setting timing"

parents 08ff0a86 3bbf6c4b

services/core/java/com/android/server/hdmi/HdmiControlService.java

+8 −1
Original line number Diff line number Diff line
@@ -621,7 +621,14 @@ public class HdmiControlService extends SystemService { 
        mWakeUpMessageReceived = false;



        if (isTvDeviceEnabled()) {

            mCecController.setOption(OptionKey.WAKEUP, tv().getAutoWakeup());

            boolean autoWakeupEnabled =

                readBooleanSetting(Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED, true);

            boolean autoDeviceOffEnabled =

                readBooleanSetting(Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED, true);



            mCecController.setOption(OptionKey.WAKEUP, autoWakeupEnabled);

            tv().setAutoWakeup(autoWakeupEnabled);

            tv().setAutoDeviceOff(autoDeviceOffEnabled);

        }

        int reason = -1;

        switch (initiatedBy) {