Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfa6a32a authored by Paul Colta's avatar Paul Colta Committed by Android (Google) Code Review
Browse files

Merge "HDMI: Enable CEC on boot-up if low energy mode is selected" into main

parents 6a149ac1 9ee54535

services/core/java/com/android/server/hdmi/HdmiControlService.java

+7 −8
Original line number Diff line number Diff line
@@ -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 {