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

Commit bee249cd authored by Nathalie Le Clair's avatar Nathalie Le Clair
Browse files

Add setting to enable the eARC feature 

Test: make, CTS Pending
Bug: 240386970
Change-Id: Ic694f7d83357efd1db7974d3cc1bd1a3ccf57dbd
parent f6b52cf9

core/api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -4081,6 +4081,7 @@ package android.hardware.hdmi { 
    method @NonNull @RequiresPermission(android.Manifest.permission.HDMI_CEC) public java.util.List<java.lang.String> getAllowedCecSettingStringValues(@NonNull String);

    method @Nullable public android.hardware.hdmi.HdmiClient getClient(int);

    method @NonNull public java.util.List<android.hardware.hdmi.HdmiDeviceInfo> getConnectedDevices();

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

    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();
@@ -4102,6 +4103,7 @@ package android.hardware.hdmi { 
    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void removeHdmiCecEnabledChangeListener(@NonNull android.hardware.hdmi.HdmiControlManager.CecSettingChangeListener);

    method @RequiresPermission(android.Manifest.permission.HDMI_CEC) public void removeHotplugEventListener(android.hardware.hdmi.HdmiControlManager.HotplugEventListener);

    method public void setActiveSource(@NonNull android.hardware.hdmi.HdmiDeviceInfo);

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

    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);
@@ -4156,6 +4158,8 @@ package android.hardware.hdmi { 
    field public static final int DEVICE_EVENT_ADD_DEVICE = 1; // 0x1

    field public static final int DEVICE_EVENT_REMOVE_DEVICE = 2; // 0x2

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

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

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

    field public static final String EXTRA_MESSAGE_EXTRA_PARAM1 = "android.hardware.hdmi.extra.MESSAGE_EXTRA_PARAM1";

    field public static final String EXTRA_MESSAGE_ID = "android.hardware.hdmi.extra.MESSAGE_ID";

    field public static final int HDMI_CEC_CONTROL_DISABLED = 0; // 0x0
@@ -4215,6 +4219,7 @@ package android.hardware.hdmi { 
    field public static final int RESULT_TIMEOUT = 1; // 0x1

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

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

    field public static final String SETTING_NAME_EARC_ENABLED = "earc_enabled";

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

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

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

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

+134 −44

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/config.xml

+7 −0
Original line number Diff line number Diff line
@@ -5515,6 +5515,13 @@ 
    <bool name="config_cecQuerySadMaxDisabled_allowed">true</bool>

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



    <!-- eARC Configuration -->

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

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

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

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

    <bool name="config_earcFeatureDisabled_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

+7 −0
Original line number Diff line number Diff line
@@ -4739,6 +4739,13 @@ 
  <java-symbol type="bool" name="config_cecQuerySadMaxDisabled_allowed" />

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



  <!-- eARC Configuration -->

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

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

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

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

  <java-symbol type="bool" name="config_earcFeatureDisabled_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

+39 −30

File changed.

Preview size limit exceeded, changes collapsed.