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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I234893830e878c02ff6d5e6b078525daf85dbff8
This commit is contained in:
daren.liao
2021-01-28 16:12:38 +00:00
committed by Automerger Merge Worker

View File

@@ -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) {