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

Commit 26f1b51b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into... 

Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master
parents 3adfddb2 8b76f669

CleanSpec.mk

+14 −0
Original line number Original line Diff line number Diff line
@@ -66,3 +66,17 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp/android.hardware 
$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore\@1\.1*" -print0 | xargs -0 rm -f)

$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore\@1\.1*" -print0 | xargs -0 rm -f)

$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore*" -print0 | xargs -0 rm -f)

$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore*" -print0 | xargs -0 rm -f)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/seccomp_policy/configstore@1.0.policy)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/seccomp_policy/configstore@1.0.policy)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/seccomp_policy/configstore@1.1.policy)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.configstore@1.1-service)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.configstore@1.1-service.rc)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.cas@1.0*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.cas@1.0*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.cas@1.0*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.configstore@1.2-service.rc)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.configstore@1.2-service)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/seccomp_policy/configstore.policy)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/apex/com.android.media.swcodec/lib64/android.hardware.configstore@1.2.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/vndk-Q/android.hardware.configstore@1.2.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/android.hardware.configstore@1.2.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-Q/android.hardware.configstore@1.2.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/android.hardware.configstore@1.2.so)

audio/5.0/IStreamIn.hal

+8 −0
Original line number Original line Diff line number Diff line
@@ -169,6 +169,10 @@ interface IStreamIn extends IStream { 
    /**

    /**

     * Specifies the logical microphone (for processing).

     * Specifies the logical microphone (for processing).

     *

     *

     * If the feature is not supported an error should be returned

     * If multiple microphones are present, this should be treated as a preference

     * for their combined direction.

     *

     * Optional method

     * Optional method

     *

     *

     * @param Direction constant

     * @param Direction constant
@@ -180,6 +184,10 @@ interface IStreamIn extends IStream { 
    /**

    /**

     * Specifies the zoom factor for the selected microphone (for processing).

     * Specifies the zoom factor for the selected microphone (for processing).

     *

     *

     * If the feature is not supported an error should be returned

     * If multiple microphones are present, this should be treated as a preference

     * for their combined field dimension.

     *

     * Optional method

     * Optional method

     *

     *

     * @param the desired field dimension of microphone capture. Range is from -1 (wide angle),

     * @param the desired field dimension of microphone capture. Range is from -1 (wide angle),

audio/5.0/config/api/current.txt

+13 −0
Original line number Original line Diff line number Diff line
@@ -20,8 +20,10 @@ package audio.policy.configuration.V5_0 { 
    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_COMMUNICATION;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_COMMUNICATION;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_DEFAULT;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_DEFAULT;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_ECHO_REFERENCE;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_FM_TUNER;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_FM_TUNER;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_HDMI;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_HDMI;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_HDMI_ARC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_IP;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_IP;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_LINE;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_LINE;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_LOOPBACK;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_LOOPBACK;
@@ -91,6 +93,10 @@ package audio.policy.configuration.V5_0 { 
    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_ERLC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_ERLC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_HE_V1;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_HE_V1;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_HE_V2;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_HE_V2;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_LATM;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_LATM_HE_V1;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_LATM_HE_V2;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_LATM_LC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_LC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_LC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_LD;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_LD;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_LTP;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_LTP;
@@ -106,7 +112,10 @@ package audio.policy.configuration.V5_0 { 
    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AMR_WB_PLUS;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AMR_WB_PLUS;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APE;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APE;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APTX;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APTX;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APTX_ADAPTIVE;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APTX_HD;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APTX_HD;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APTX_TWSP;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_CELT;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_DOLBY_TRUEHD;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_DOLBY_TRUEHD;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_DSD;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_DSD;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_DTS;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_DTS;
@@ -122,6 +131,8 @@ package audio.policy.configuration.V5_0 { 
    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_HE_AAC_V2;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_HE_AAC_V2;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_IEC61937;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_IEC61937;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_LDAC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_LDAC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_LHDC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_LHDC_LL;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_1_0;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_1_0;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_2_0;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_2_0;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_2_1;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_2_1;
@@ -187,6 +198,7 @@ package audio.policy.configuration.V5_0 { 
  public static class DevicePorts.DevicePort {

  public static class DevicePorts.DevicePort {

    ctor public DevicePorts.DevicePort();

    ctor public DevicePorts.DevicePort();

    method public String getAddress();

    method public String getAddress();

    method public java.util.List<audio.policy.configuration.V5_0.AudioFormat> getEncodedFormats();

    method public audio.policy.configuration.V5_0.Gains getGains();

    method public audio.policy.configuration.V5_0.Gains getGains();

    method public java.util.List<audio.policy.configuration.V5_0.Profile> getProfile();

    method public java.util.List<audio.policy.configuration.V5_0.Profile> getProfile();

    method public audio.policy.configuration.V5_0.Role getRole();

    method public audio.policy.configuration.V5_0.Role getRole();
@@ -194,6 +206,7 @@ package audio.policy.configuration.V5_0 { 
    method public String getType();

    method public String getType();

    method public boolean get_default();

    method public boolean get_default();

    method public void setAddress(String);

    method public void setAddress(String);

    method public void setEncodedFormats(java.util.List<audio.policy.configuration.V5_0.AudioFormat>);

    method public void setGains(audio.policy.configuration.V5_0.Gains);

    method public void setGains(audio.policy.configuration.V5_0.Gains);

    method public void setRole(audio.policy.configuration.V5_0.Role);

    method public void setRole(audio.policy.configuration.V5_0.Role);

    method public void setTagName(String);

    method public void setTagName(String);

audio/5.0/config/audio_policy_configuration.xsd

+16 −3
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ 
                <xs:element name="globalConfiguration" type="globalConfiguration"/>

                <xs:element name="globalConfiguration" type="globalConfiguration"/>

                <xs:element name="modules" type="modules" maxOccurs="unbounded"/>

                <xs:element name="modules" type="modules" maxOccurs="unbounded"/>

                <xs:element name="volumes" type="volumes" maxOccurs="unbounded"/>

                <xs:element name="volumes" type="volumes" maxOccurs="unbounded"/>

                <xs:element name="surroundSound" type="surroundSound" />

                <xs:element name="surroundSound" type="surroundSound" minOccurs="0" />

            </xs:sequence>

            </xs:sequence>

            <xs:attribute name="version" type="version"/>

            <xs:attribute name="version" type="version"/>

        </xs:complexType>

        </xs:complexType>
@@ -277,6 +277,8 @@ 
            <xs:enumeration value="AUDIO_DEVICE_IN_PROXY"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_PROXY"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_USB_HEADSET"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_USB_HEADSET"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_BLUETOOTH_BLE"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_BLUETOOTH_BLE"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_HDMI_ARC"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_ECHO_REFERENCE"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_DEFAULT"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_DEFAULT"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_STUB"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_STUB"/>

        </xs:restriction>

        </xs:restriction>
@@ -364,6 +366,15 @@ 
            <xs:enumeration value="AUDIO_FORMAT_MAT_2_1"/>

            <xs:enumeration value="AUDIO_FORMAT_MAT_2_1"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_XHE"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_XHE"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_ADTS_XHE"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_ADTS_XHE"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_LATM"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_LATM_LC"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_LATM_HE_V1"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_LATM_HE_V2"/>

            <xs:enumeration value="AUDIO_FORMAT_CELT"/>

            <xs:enumeration value="AUDIO_FORMAT_APTX_ADAPTIVE"/>

            <xs:enumeration value="AUDIO_FORMAT_LHDC"/>

            <xs:enumeration value="AUDIO_FORMAT_LHDC_LL"/>

            <xs:enumeration value="AUDIO_FORMAT_APTX_TWSP"/>

        </xs:restriction>

        </xs:restriction>

    </xs:simpleType>

    </xs:simpleType>

    <xs:simpleType name="extendableAudioFormat">

    <xs:simpleType name="extendableAudioFormat">
@@ -461,6 +472,8 @@ 
                            </xs:documentation>

                            </xs:documentation>

                        </xs:annotation>

                        </xs:annotation>

                    </xs:attribute>

                    </xs:attribute>

                    <xs:attribute name="encodedFormats" type="audioFormatsList" use="optional"

                                  default="" />

                </xs:complexType>

                </xs:complexType>

                <xs:unique name="devicePortProfileUniqueness">

                <xs:unique name="devicePortProfileUniqueness">

                    <xs:selector xpath="profile"/>

                    <xs:selector xpath="profile"/>
@@ -595,7 +608,7 @@ 
            <xs:element name="formats" type="surroundFormats"/>

            <xs:element name="formats" type="surroundFormats"/>

        </xs:sequence>

        </xs:sequence>

    </xs:complexType>

    </xs:complexType>

    <xs:simpleType name="surroundFormatsList">

    <xs:simpleType name="audioFormatsList">

        <xs:list itemType="audioFormat" />

        <xs:list itemType="audioFormat" />

    </xs:simpleType>

    </xs:simpleType>

    <xs:complexType name="surroundFormats">

    <xs:complexType name="surroundFormats">
@@ -603,7 +616,7 @@ 
            <xs:element name="format" minOccurs="0" maxOccurs="unbounded">

            <xs:element name="format" minOccurs="0" maxOccurs="unbounded">

                <xs:complexType>

                <xs:complexType>

                    <xs:attribute name="name" type="audioFormat" use="required"/>

                    <xs:attribute name="name" type="audioFormat" use="required"/>

                    <xs:attribute name="subformats" type="surroundFormatsList" />

                    <xs:attribute name="subformats" type="audioFormatsList" />

                </xs:complexType>

                </xs:complexType>

            </xs:element>

            </xs:element>

        </xs:sequence>

        </xs:sequence>

audio/README

+16 −31
Original line number Original line Diff line number Diff line 
Directory structure of the audio HIDL related code.

Directory structure of the audio HIDL related code.





audio

audio

|-- 2.0              <== HIDL (.hal) can not be moved to fit the directory structure

|-- 2.0              <== core 2.0 HIDL API. .hal can not be moved into the core directory

|                        because that would create a separate HAL

|                        because that would change its namespace and include path

|-- 4.0              <== Version 4.0 of the core API

|-- 4.0              <== Version 4.0 of the core API

|

|

|-- ...

|

|-- common           <== code common to audio core and effect API

|-- common           <== code common to audio core and effect API

|   |-- 2.0

|   |-- 2.0          <== HIDL API of V2

|   |   |-- default  <== code that wraps the legacy API

|   |   `-- vts      <== vts of 2.0 core and effect API common code

|   |-- 4.0

|   |-- 4.0

|   |   |-- default

|   |-- ...

|   |   `-- vts

|   |-- ...          <== The future versions should continue this structure

|   |   |-- default

|   |   `-- vts

|   `-- all_versions <== code common to all version of both core and effect API

|   `-- all_versions <== code common to all version of both core and effect API

|       |-- default

|       |-- default  <== implementation shared code between core and effect impl

|       `-- vts      <== vts of core and effect API common version independent code

|       |-- test     <== utilities used by tests

|       `-- util     <== utilities used by both implementation and tests

|

|

|-- core           <== code relative to the core API

|-- core             <== VTS and default implementation of the core API (not HIDL, see /audio/2.0))

|   |-- 2.0          <== 2.0 core API code (except .hal, see audio/2.0)

|   `-- all_versions <== Code is version independent through #if and separate files

|   |   |-- default

|       |-- default  <== code that wraps the legacy API

|   |   `-- vts

|       `-- vts      <== vts of core API

|           |-- 2.0  <== 2.0 specific tests and helpers

|           |-- 4.0

|           |-- 4.0

|   |   |-- default  <== default implementation of the core 4.0 api

|   |   `-- vts      <== vts code of the 4.0 API

|           |-- ...

|           |-- ...

|   |   |-- default

|   |   `-- vts

|   `-- all_versions

|       |-- default

|       `-- vts      <== vts of core API common version independent code

|

|

`-- effect           <== idem for the effect API

`-- effect           <== idem for the effect API

    |-- 2.0

    |-- 2.0

    |   |-- default

    |   `-- vts

    |-- 4.0

    |-- 4.0

    |   |-- default

    |   `-- vts

    |-- ...

    |-- ...

    |   |-- default

    |   `-- vts

    `-- all_versions

    `-- all_versions

        |-- default

        |-- default

        `-- vts
 
        `-- vts