diff options
| -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) {  |