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

Commit 0770cd25 authored by daren.liao's avatar daren.liao Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Fix CEC read Global Setting timing am: 3bbf6c4b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I234893830e878c02ff6d5e6b078525daf85dbff8
parents 45f1fa00 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) {