From ab5f1f83984c00fcc5f4d760512c5ee659cce51f Mon Sep 17 00:00:00 2001 From: Michal Olech Date: Tue, 20 Apr 2021 17:46:04 +0200 Subject: [PATCH] [CEC Configuration] Rename Power Control Mode setting name string This string is used to refer to configuration settings and when preserving the values in permanent storage. Bug: 184813910 Test: atest HdmiControlManagerTest HdmiCecConfigTest Change-Id: I9c24b627f71b808533ef31d0c371ff7301bc757e --- core/api/system-current.txt | 2 +- core/java/android/hardware/hdmi/HdmiControlManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a5287deee84e1..de69781957d9a 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -3315,7 +3315,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"; diff --git a/core/java/android/hardware/hdmi/HdmiControlManager.java b/core/java/android/hardware/hdmi/HdmiControlManager.java index 6079c57e429a1..ecfc0d582b1c6 100644 --- a/core/java/android/hardware/hdmi/HdmiControlManager.java +++ b/core/java/android/hardware/hdmi/HdmiControlManager.java @@ -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. *