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

Commit 11368760 authored by Xin Li's avatar Xin Li
Browse files

Merge Android R 

Bug: 168057903
Merged-In: I33c8b79d82aaaecd05cc1c74f6c6a8613c42fa68
Change-Id: I0586c24e16b7d052b0d209e2dffd6124492fcafa
parents e551cc10 f9d897c0

Android.bp

+13 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ cc_defaults { 


    // Lists all dependencies that can *not* be expected on the device.

    static_libs: [

        "VtsHalHidlTargetTestBase",

        "VtsHalHidlTestUtils",

        "libhidl-gen-utils",

    ],
@@ -47,3 +47,15 @@ cc_defaults { 


    require_root: true,

}



// TODO: Remove this after all vts tests under vendor/qcom are converted to

// parameterized gtest.

cc_defaults {

    name: "Vts10HalTargetTestDefaults",

    defaults: [

        "VtsHalTargetTestDefaults",

    ],

    static_libs: [

        "VtsHalHidlTargetTestBase",

    ],

}

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -84,3 +84,4 @@ $(call add-clean-step, rm -f $(PRODUCT_OUT)/etc/init/android.hardware.audio@2.0- 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.cas@1.1*)

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

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

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/wifi/1.4/android.hardware.wifi@1.4-adapter_genc++/)

TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 
    },

    {

      "name": "hal_implementation_test"

    },

    {

      "name": "VtsHalTvInputV1_0TargetTest"

    }

  ]

}

audio/6.0/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ hidl_interface { 
        "IStreamIn.hal",

        "IStreamOut.hal",

        "IStreamOutCallback.hal",

        "IStreamOutEventCallback.hal",

    ],

    interfaces: [

        "android.hardware.audio.common@6.0",

audio/6.0/IDevice.hal

+26 −2
Original line number Diff line number Diff line
@@ -149,7 +149,10 @@ interface IDevice { 
                    AudioConfig suggestedConfig);



    /**

     * Returns whether HAL supports audio patches.

     * Returns whether HAL supports audio patches. Patch represents a connection

     * between signal source(s) and signal sink(s). If HAL doesn't support

     * patches natively (in hardware) then audio system will need to establish

     * them in software.

     *

     * @return supports true if audio patches are supported.

     */
@@ -167,6 +170,25 @@ interface IDevice { 
    createAudioPatch(vec<AudioPortConfig> sources, vec<AudioPortConfig> sinks)

            generates (Result retval, AudioPatchHandle patch);



    /**

     * Updates an audio patch.

     *

     * Use of this function is preferred to releasing and re-creating a patch

     * as the HAL module can figure out a way of switching the route without

     * causing audio disruption.

     *

     * @param previousPatch handle of the previous patch to update.

     * @param sources new patch sources.

     * @param sinks new patch sinks.

     * @return retval operation completion status.

     * @return patch updated patch handle.

     */

    updateAudioPatch(

            AudioPatchHandle previousPatch,

            vec<AudioPortConfig> sources,

            vec<AudioPortConfig> sinks) generates (

                    Result retval, AudioPatchHandle patch);



    /**

     * Release an audio patch.

     *
@@ -297,7 +319,9 @@ interface IDevice { 
    close() generates (Result retval);



    /**

     * Applies an audio effect to an audio device.

     * Applies an audio effect to an audio device. The effect is inserted

     * according to its insertion preference specified by INSERT_... EffectFlags

     * in the EffectDescriptor.

     *

     * @param device identifies the sink or source device this effect must be applied to.

     *               "device" is the AudioPortHandle indicated for the device when the audio