Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I424d9adecad265dda86e581f2fc86990fb97b2fb
This commit is contained in:
daren.liao
2021-01-28 16:49:40 +00:00
committed by Automerger Merge Worker
parent 387f57737c 0770cd25c2
commit 79f19d0314
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/hdmi/HdmiControlService.java
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) {