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

Commit 21223c9b authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Android (Google) Code Review
Browse files

Merge "Make list of SADs to query configurable"

parents cb41847c 839b9094

core/api/system-current.txt

+20 −0
Original line number Diff line number Diff line
@@ -3355,6 +3355,7 @@ package android.hardware.hdmi { 
    method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public String getPowerControlMode();

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

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

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

    method @Nullable public android.hardware.hdmi.HdmiSwitchClient getSwitchClient();

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

    method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public int getSystemAudioModeMuting();
@@ -3373,6 +3374,8 @@ package android.hardware.hdmi { 
    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 setRoutingControl(@NonNull int);

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setSadPresenceInQuery(@NonNull String, int);

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

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

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

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void setSystemAudioModeMuting(@NonNull int);
@@ -3384,6 +3387,21 @@ package android.hardware.hdmi { 
    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 = "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_QUERY_SAD_AAC = "query_sad_aac";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_ATRAC = "query_sad_atrac";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_DD = "query_sad_dd";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_DDP = "query_sad_ddp";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_DST = "query_sad_dst";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_DTS = "query_sad_dts";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_DTSHD = "query_sad_dtshd";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_LPCM = "query_sad_lpcm";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_MAX = "query_sad_max";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_MP3 = "query_sad_mp3";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_MPEG1 = "query_sad_mpeg1";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_MPEG2 = "query_sad_mpeg2";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_ONEBITAUDIO = "query_sad_onebitaudio";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_TRUEHD = "query_sad_truehd";

    field public static final String CEC_SETTING_NAME_QUERY_SAD_WMAPRO = "query_sad_wmapro";

    field public static final String CEC_SETTING_NAME_ROUTING_CONTROL = "routing_control";

    field public static final String CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL = "system_audio_control";

    field public static final String CEC_SETTING_NAME_SYSTEM_AUDIO_MODE_MUTING = "system_audio_mode_muting";
@@ -3451,6 +3469,8 @@ package android.hardware.hdmi { 
    field public static final int POWER_STATUS_TRANSIENT_TO_ON = 2; // 0x2

    field public static final int POWER_STATUS_TRANSIENT_TO_STANDBY = 3; // 0x3

    field public static final int POWER_STATUS_UNKNOWN = -1; // 0xffffffff

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

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

    field @Deprecated public static final int RESULT_ALREADY_IN_PROGRESS = 4; // 0x4

    field public static final int RESULT_COMMUNICATION_FAILED = 7; // 0x7

    field public static final int RESULT_EXCEPTION = 5; // 0x5

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

+395 −281

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/config.xml

+91 −0
Original line number Diff line number Diff line
@@ -5104,6 +5104,97 @@ 
    <bool name="config_cecRcProfileSourceMediaContextSensitiveMenuNotHandled_allowed">true</bool>

    <bool name="config_cecRcProfileSourceMediaContextSensitiveMenuNotHandled_default">true</bool>



    <!-- Which Short Audio Descriptors a TV should query via CEC -->

    <bool name="config_cecQuerySadLpcm_userConfigurable">true</bool>

    <bool name="config_cecQuerySadLpcmEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadLpcmEnabled_default">true</bool>

    <bool name="config_cecQuerySadLpcmDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadLpcmDisabled_default">false</bool>



    <bool name="config_cecQuerySadDd_userConfigurable">true</bool>

    <bool name="config_cecQuerySadDdEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadDdEnabled_default">true</bool>

    <bool name="config_cecQuerySadDdDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadDdDisabled_default">false</bool>



    <bool name="config_cecQuerySadMpeg1_userConfigurable">true</bool>

    <bool name="config_cecQuerySadMpeg1Enabled_allowed">true</bool>

    <bool name="config_cecQuerySadMpeg1Enabled_default">true</bool>

    <bool name="config_cecQuerySadMpeg1Disabled_allowed">true</bool>

    <bool name="config_cecQuerySadMpeg1Disabled_default">false</bool>



    <bool name="config_cecQuerySadMp3_userConfigurable">true</bool>

    <bool name="config_cecQuerySadMp3Enabled_allowed">true</bool>

    <bool name="config_cecQuerySadMp3Enabled_default">true</bool>

    <bool name="config_cecQuerySadMp3Disabled_allowed">true</bool>

    <bool name="config_cecQuerySadMp3Disabled_default">false</bool>



    <bool name="config_cecQuerySadMpeg2_userConfigurable">true</bool>

    <bool name="config_cecQuerySadMpeg2Enabled_allowed">true</bool>

    <bool name="config_cecQuerySadMpeg2Enabled_default">true</bool>

    <bool name="config_cecQuerySadMpeg2Disabled_allowed">true</bool>

    <bool name="config_cecQuerySadMpeg2Disabled_default">false</bool>



    <bool name="config_cecQuerySadAac_userConfigurable">true</bool>

    <bool name="config_cecQuerySadAacEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadAacEnabled_default">true</bool>

    <bool name="config_cecQuerySadAacDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadAacDisabled_default">false</bool>



    <bool name="config_cecQuerySadDts_userConfigurable">true</bool>

    <bool name="config_cecQuerySadDtsEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadDtsEnabled_default">true</bool>

    <bool name="config_cecQuerySadDtsDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadDtsDisabled_default">false</bool>



    <bool name="config_cecQuerySadAtrac_userConfigurable">true</bool>

    <bool name="config_cecQuerySadAtracEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadAtracEnabled_default">true</bool>

    <bool name="config_cecQuerySadAtracDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadAtracDisabled_default">false</bool>



    <bool name="config_cecQuerySadOnebitaudio_userConfigurable">true</bool>

    <bool name="config_cecQuerySadOnebitaudioEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadOnebitaudioEnabled_default">true</bool>

    <bool name="config_cecQuerySadOnebitaudioDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadOnebitaudioDisabled_default">false</bool>



    <bool name="config_cecQuerySadDdp_userConfigurable">true</bool>

    <bool name="config_cecQuerySadDdpEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadDdpEnabled_default">true</bool>

    <bool name="config_cecQuerySadDdpDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadDdpDisabled_default">false</bool>



    <bool name="config_cecQuerySadDtshd_userConfigurable">true</bool>

    <bool name="config_cecQuerySadDtshdEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadDtshdEnabled_default">true</bool>

    <bool name="config_cecQuerySadDtshdDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadDtshdDisabled_default">false</bool>



    <bool name="config_cecQuerySadTruehd_userConfigurable">true</bool>

    <bool name="config_cecQuerySadTruehdEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadTruehdEnabled_default">true</bool>

    <bool name="config_cecQuerySadTruehdDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadTruehdDisabled_default">false</bool>



    <bool name="config_cecQuerySadDst_userConfigurable">true</bool>

    <bool name="config_cecQuerySadDstEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadDstEnabled_default">true</bool>

    <bool name="config_cecQuerySadDstDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadDstDisabled_default">false</bool>



    <bool name="config_cecQuerySadWmapro_userConfigurable">true</bool>

    <bool name="config_cecQuerySadWmaproEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadWmaproEnabled_default">true</bool>

    <bool name="config_cecQuerySadWmaproDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadWmaproDisabled_default">false</bool>



    <bool name="config_cecQuerySadMax_userConfigurable">true</bool>

    <bool name="config_cecQuerySadMaxEnabled_allowed">true</bool>

    <bool name="config_cecQuerySadMaxEnabled_default">true</bool>

    <bool name="config_cecQuerySadMaxDisabled_allowed">true</bool>

    <bool name="config_cecQuerySadMaxDisabled_default">false</bool>



    <!-- Whether app hibernation deletes OAT artifact files as part of global hibernation. -->

    <bool name="config_hibernationDeletesOatArtifactsEnabled">true</bool>

core/res/res/values/symbols.xml

+91 −0
Original line number Diff line number Diff line
@@ -4432,6 +4432,97 @@ 
  <java-symbol type="bool" name="config_cecRcProfileSourceMediaContextSensitiveMenuNotHandled_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileSourceMediaContextSensitiveMenuNotHandled_default" />



  <!-- Which Short Audio Descriptors a TV should query via CEC -->

  <java-symbol type="bool" name="config_cecQuerySadLpcm_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadLpcmEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadLpcmEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadLpcmDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadLpcmDisabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadDd_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadDdEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadDdEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadDdDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadDdDisabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadMpeg1_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadMpeg1Enabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadMpeg1Enabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadMpeg1Disabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadMpeg1Disabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadMp3_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadMp3Enabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadMp3Enabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadMp3Disabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadMp3Disabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadMpeg2_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadMpeg2Enabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadMpeg2Enabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadMpeg2Disabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadMpeg2Disabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadAac_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadAacEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadAacEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadAacDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadAacDisabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadDts_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadDtsEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadDtsEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadDtsDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadDtsDisabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadAtrac_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadAtracEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadAtracEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadAtracDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadAtracDisabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadOnebitaudio_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadOnebitaudioEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadOnebitaudioEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadOnebitaudioDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadOnebitaudioDisabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadDdp_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadDdpEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadDdpEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadDdpDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadDdpDisabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadDtshd_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadDtshdEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadDtshdEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadDtshdDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadDtshdDisabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadTruehd_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadTruehdEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadTruehdEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadTruehdDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadTruehdDisabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadDst_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadDstEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadDstEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadDstDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadDstDisabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadWmapro_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadWmaproEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadWmaproEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadWmaproDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadWmaproDisabled_default" />



  <java-symbol type="bool" name="config_cecQuerySadMax_userConfigurable" />

  <java-symbol type="bool" name="config_cecQuerySadMaxEnabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadMaxEnabled_default" />

  <java-symbol type="bool" name="config_cecQuerySadMaxDisabled_allowed" />

  <java-symbol type="bool" name="config_cecQuerySadMaxDisabled_default" />



  <!-- Ids for RemoteViews -->

  <java-symbol type="id" name="remote_views_next_child" />

  <java-symbol type="id" name="remote_views_stable_id" />

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

+250 −10

File changed.

Preview size limit exceeded, changes collapsed.