diff options
| author | 2021-01-28 16:12:38 +0000 | |
|---|---|---|
| committer | 2021-01-28 16:12:38 +0000 | |
| commit | 0770cd25c23f3640cd000ebc0edd55b8e8867859 (patch) | |
| tree | dec079aac197cd6f498e7795d0dcd2efc993efe0 | |
| parent | 45f1fa008cd3c97b47d5f73d610a5146151eac17 (diff) | |
| parent | 3bbf6c4bc02f0a754bfa5dedd251824cd8267ff1 (diff) | |
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
| -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) { |