diff options
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiControlService.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 0c5069f81774..4ec179727d85 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -725,6 +725,13 @@ public class HdmiControlService extends SystemService { } mPowerStatusController.setPowerStatus(getInitialPowerStatus()); setProhibitMode(false); + if (isTvDevice() && getWasCecDisabledOnStandbyByLowEnergyMode()) { + Slog.w(TAG, "Re-enable CEC on boot-up since it was disabled due to low energy " + + " mode."); + mHdmiCecConfig.setIntValue(HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED, + HDMI_CEC_CONTROL_ENABLED); + setWasCecDisabledOnStandbyByLowEnergyMode(false); + } mHdmiControlEnabled = mHdmiCecConfig.getIntValue( HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED); @@ -771,14 +778,6 @@ public class HdmiControlService extends SystemService { Slog.i(TAG, "Device does not support eARC."); } mHdmiCecNetwork = new HdmiCecNetwork(this, mCecController, mMhlController); - if (isTvDevice() && getWasCecDisabledOnStandbyByLowEnergyMode()) { - Slog.w(TAG, "Re-enable CEC on boot-up since it was disabled due to low energy " - + " mode."); - getHdmiCecConfig().setIntValue(HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED, - HDMI_CEC_CONTROL_ENABLED); - setWasCecDisabledOnStandbyByLowEnergyMode(false); - setCecEnabled(HDMI_CEC_CONTROL_ENABLED); - } if (isCecControlEnabled()) { initializeCec(INITIATED_BY_BOOT_UP); } else { |