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

Commit 1abb5dc2 authored by Michal Olech's avatar Michal Olech Committed by Android (Google) Code Review
Browse files

Merge "[CEC Configuration] Rename Power Control Mode setting name string" into sc-dev

parents 90aba177 ab5f1f83

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3316,7 +3316,7 @@ package android.hardware.hdmi { 
    field public static final int AVR_VOLUME_MUTED = 101; // 0x65

    field public static final String CEC_SETTING_NAME_HDMI_CEC_ENABLED = "hdmi_cec_enabled";

    field public static final String CEC_SETTING_NAME_HDMI_CEC_VERSION = "hdmi_cec_version";

    field public static final String CEC_SETTING_NAME_POWER_CONTROL_MODE = "send_standby_on_sleep";

    field public static final String CEC_SETTING_NAME_POWER_CONTROL_MODE = "power_control_mode";

    field public static final String CEC_SETTING_NAME_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST = "power_state_change_on_active_source_lost";

    field public static final String CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING = "system_audio_mode_muting";

    field public static final String CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP = "tv_send_standby_on_sleep";

core/java/android/hardware/hdmi/HdmiControlManager.java

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ public final class HdmiControlManager { 
     * @hide

     */

    @SystemApi

    public static final String CEC_SETTING_NAME_POWER_CONTROL_MODE = "send_standby_on_sleep";

    public static final String CEC_SETTING_NAME_POWER_CONTROL_MODE = "power_control_mode";

    /**

     * Name of a setting deciding on power state action when losing Active Source.

     *