diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-28 15:44:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-28 15:44:40 +0000 |
| commit | 7e69b0a93d09f45d93e38cbdfd4bff7042d6de9a (patch) | |
| tree | 82577a167e78c54d1706bb29c4c0325c7d1bce99 | |
| parent | 08ff0a8639bd38b12eb49a8f9107be9d6272b3de (diff) | |
| parent | 3bbf6c4bc02f0a754bfa5dedd251824cd8267ff1 (diff) | |
Merge "DO NOT MERGE Fix CEC read Global Setting timing"
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiControlService.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 8e50bb4885d8..5d1c4e6715f1 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -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) { |