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

Commit bafe0c9c authored by Michal Olech's avatar Michal Olech Committed by Automerger Merge Worker
Browse files

Merge "[CEC Configuration] Add @SystemApi for all remaining settings" into sc-dev am: 9a49890e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13815985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc6c42648e6e42a021d77295536ef05748665698
parents 5777faaf 9a49890e

core/api/system-current.txt

+15 −0
Original line number Diff line number Diff line
@@ -3104,6 +3104,7 @@ package android.hardware.hdmi { 
    method @NonNull public java.util.List<android.hardware.hdmi.HdmiDeviceInfo> getConnectedDevices();

    method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public int getHdmiCecEnabled();

    method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public int getHdmiCecVersion();

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public int getHdmiCecVolumeControlEnabled();

    method public int getPhysicalAddress();

    method @Nullable public android.hardware.hdmi.HdmiPlaybackClient getPlaybackClient();

    method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public String getPowerControlMode();
@@ -3111,6 +3112,8 @@ package android.hardware.hdmi { 
    method @Nullable public android.hardware.hdmi.HdmiSwitchClient getSwitchClient();

    method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public int getSystemAudioModeMuting();

    method @Nullable public android.hardware.hdmi.HdmiTvClient getTvClient();

    method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public int getTvSendStandbyOnSleep();

    method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public int getTvWakeOnOneTouchPlay();

    method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public java.util.List<java.lang.String> getUserCecSettings();

    method public boolean isDeviceConnected(@NonNull android.hardware.hdmi.HdmiDeviceInfo);

    method public void powerOffDevice(@NonNull android.hardware.hdmi.HdmiDeviceInfo);
@@ -3119,10 +3122,13 @@ package android.hardware.hdmi { 
    method public void setActiveSource(@NonNull android.hardware.hdmi.HdmiDeviceInfo);

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setHdmiCecEnabled(@NonNull int);

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setHdmiCecVersion(@NonNull int);

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setHdmiCecVolumeControlEnabled(int);

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setPowerControlMode(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setPowerStateChangeOnActiveSourceLost(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setStandbyMode(boolean);

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setSystemAudioModeMuting(@NonNull int);

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setTvSendStandbyOnSleep(@NonNull int);

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setTvWakeOnOneTouchPlay(@NonNull int);

    field public static final String ACTION_OSD_MESSAGE = "android.hardware.hdmi.action.OSD_MESSAGE";

    field public static final int AVR_VOLUME_MUTED = 101; // 0x65

    field public static final String CEC_SETTING_NAME_HDMI_CEC_ENABLED = "hdmi_cec_enabled";
@@ -3130,6 +3136,9 @@ package android.hardware.hdmi { 
    field public static final String CEC_SETTING_NAME_POWER_CONTROL_MODE = "send_standby_on_sleep";

    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";

    field public static final String CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY = "tv_wake_on_one_touch_play";

    field public static final String CEC_SETTING_NAME_VOLUME_CONTROL_MODE = "volume_control_enabled";

    field public static final int CLEAR_TIMER_STATUS_CEC_DISABLE = 162; // 0xa2

    field public static final int CLEAR_TIMER_STATUS_CHECK_RECORDER_CONNECTION = 160; // 0xa0

    field public static final int CLEAR_TIMER_STATUS_FAIL_TO_CLEAR_SELECTED_SOURCE = 161; // 0xa1
@@ -3225,6 +3234,12 @@ package android.hardware.hdmi { 
    field public static final int TIMER_STATUS_PROGRAMMED_INFO_MIGHT_NOT_ENOUGH_SPACE = 11; // 0xb

    field public static final int TIMER_STATUS_PROGRAMMED_INFO_NOT_ENOUGH_SPACE = 9; // 0x9

    field public static final int TIMER_STATUS_PROGRAMMED_INFO_NO_MEDIA_INFO = 10; // 0xa

    field public static final int TV_SEND_STANDBY_ON_SLEEP_DISABLED = 0; // 0x0

    field public static final int TV_SEND_STANDBY_ON_SLEEP_ENABLED = 1; // 0x1

    field public static final int TV_WAKE_ON_ONE_TOUCH_PLAY_DISABLED = 0; // 0x0

    field public static final int TV_WAKE_ON_ONE_TOUCH_PLAY_ENABLED = 1; // 0x1

    field public static final int VOLUME_CONTROL_DISABLED = 0; // 0x0

    field public static final int VOLUME_CONTROL_ENABLED = 1; // 0x1

  }















  public static interface HdmiControlManager.CecSettingChangeListener {

































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



+15
−0






























Original line number
Diff line number
Diff line








@@ -461,6 +461,7 @@ public final class HdmiControlManager {













     * @see HdmiControlManager#CEC_SETTING_NAME_VOLUME_CONTROL_MODE















     * @hide















     */













    @SystemApi















    public static final int VOLUME_CONTROL_ENABLED = 1;















    /**















     * HDMI CEC disabled.









@@ -468,6 +469,7 @@ public final class HdmiControlManager {













     * @see HdmiControlManager#CEC_SETTING_NAME_VOLUME_CONTROL_MODE















     * @hide















     */













    @SystemApi















    public static final int VOLUME_CONTROL_DISABLED = 0;















    /**















     * @see HdmiControlManager#CEC_SETTING_NAME_VOLUME_CONTROL_MODE









@@ -486,12 +488,14 @@ public final class HdmiControlManager {













     *















     * @hide















     */













    @SystemApi















    public static final int TV_WAKE_ON_ONE_TOUCH_PLAY_ENABLED = 1;















    /**















     * TV Wake on One Touch Play disabled.















     *















     * @hide















     */













    @SystemApi















    public static final int TV_WAKE_ON_ONE_TOUCH_PLAY_DISABLED = 0;















    /**















     * @hide









@@ -509,12 +513,14 @@ public final class HdmiControlManager {













     *















     * @hide















     */













    @SystemApi















    public static final int TV_SEND_STANDBY_ON_SLEEP_ENABLED = 1;















    /**















     * Not sending &lt;Standby&gt; on sleep.















     *















     * @hide















     */













    @SystemApi















    public static final int TV_SEND_STANDBY_ON_SLEEP_DISABLED = 0;















    /**















     * @hide










@@ -759,6 +765,7 @@ public final class HdmiControlManager {













     * @hide















     * @see android.hardware.hdmi.HdmiControlManager#setHdmiCecVolumeControlEnabled(int)















     */













    @SystemApi















    public static final String CEC_SETTING_NAME_VOLUME_CONTROL_MODE =















            "volume_control_enabled";















    /**









@@ -767,6 +774,7 @@ public final class HdmiControlManager {













     *















     * @hide















     */













    @SystemApi















    public static final String CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY =















            "tv_wake_on_one_touch_play";















    /**









@@ -775,6 +783,7 @@ public final class HdmiControlManager {













     *















     * @hide















     */













    @SystemApi















    public static final String CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP =















            "tv_send_standby_on_sleep";















    /**










@@ -1259,6 +1268,7 @@ public final class HdmiControlManager {













     * @see HdmiControlManager#CEC_SETTING_NAME_VOLUME_CONTROL_MODE















     * @hide















     */













    @SystemApi















    @RequiresPermission(android.Manifest.permission.HDMI_CEC)















    public void setHdmiCecVolumeControlEnabled(















            @VolumeControl int hdmiCecVolumeControlEnabled) {









@@ -1274,6 +1284,7 @@ public final class HdmiControlManager {













     * Returns whether volume changes via HDMI CEC are enabled.















     * @hide















     */













    @SystemApi















    @RequiresPermission(android.Manifest.permission.HDMI_CEC)















    @VolumeControl















    public int getHdmiCecVolumeControlEnabled() {










@@ -2155,6 +2166,7 @@ public final class HdmiControlManager {













     *















     * @hide















     */













    @SystemApi















    @RequiresPermission(android.Manifest.permission.HDMI_CEC)















    public void setTvWakeOnOneTouchPlay(@NonNull @TvWakeOnOneTouchPlay int value) {















        if (mService == null) {









@@ -2176,6 +2188,7 @@ public final class HdmiControlManager {













     *















     * @hide















     */













    @SystemApi















    @NonNull















    @TvWakeOnOneTouchPlay















    @RequiresPermission(android.Manifest.permission.HDMI_CEC)









@@ -2199,6 +2212,7 @@ public final class HdmiControlManager {













     *















     * @hide















     */













    @SystemApi















    @RequiresPermission(android.Manifest.permission.HDMI_CEC)















    public void setTvSendStandbyOnSleep(@NonNull @TvSendStandbyOnSleep int value) {















        if (mService == null) {









@@ -2220,6 +2234,7 @@ public final class HdmiControlManager {













     *















     * @hide















     */













    @SystemApi















    @NonNull















    @TvSendStandbyOnSleep















    @RequiresPermission(android.Manifest.permission.HDMI_CEC)