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

Commit 1e05e9f3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-c72e46fd-06a9-4104-bad3-f7ba8aeb3e1d-for-git_oc-release-402991... 

release-request-c72e46fd-06a9-4104-bad3-f7ba8aeb3e1d-for-git_oc-release-4029917 snap-temp-L38800000066299680

Change-Id: I0ad043f21c69db5297cf22b8cf83849ef2982a90
parents d680d78f 2bb2add8

audio/2.0/default/ParametersUtil.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -78,8 +78,9 @@ void ParametersUtil::getParametersImpl( 
        halKeys.addKey(String8(keys[i].c_str()));

        halKeys.addKey(String8(keys[i].c_str()));

    }

    }

    std::unique_ptr<AudioParameter> halValues = getParams(halKeys);

    std::unique_ptr<AudioParameter> halValues = getParams(halKeys);

    Result retval =

    Result retval = (keys.size() == 0 || halValues->size() != 0)

        halValues->size() == keys.size() ? Result::OK : Result::NOT_SUPPORTED;

                        ? Result::OK

                        : Result::NOT_SUPPORTED;

    hidl_vec<ParameterValue> result;

    hidl_vec<ParameterValue> result;

    result.resize(halValues->size());

    result.resize(halValues->size());

    String8 halKey, halValue;

    String8 halKey, halValue;

audio/effect/2.0/vts/functional/VtsHalAudioEffectV2_0TargetTest.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -450,14 +450,16 @@ TEST_F(AudioEffectHidlTest, SetAudioSource) { 
}

}





TEST_F(AudioEffectHidlTest, Offload) {

TEST_F(AudioEffectHidlTest, Offload) {

  description("Verify that calling Offload methods works for an effect");

  description("Verify that calling Offload method either works or returns not supported");

  EffectOffloadParameter offloadParam;

  EffectOffloadParameter offloadParam;

  offloadParam.isOffload = false;

  offloadParam.isOffload = false;

  offloadParam.ioHandle =

  offloadParam.ioHandle =

      static_cast<int>(AudioHandleConsts::AUDIO_IO_HANDLE_NONE);

      static_cast<int>(AudioHandleConsts::AUDIO_IO_HANDLE_NONE);

  Return<Result> ret = effect->offload(offloadParam);

  Return<Result> ret = effect->offload(offloadParam);

  EXPECT_TRUE(ret.isOk());

  EXPECT_TRUE(ret.isOk());

  EXPECT_EQ(Result::OK, ret);

  EXPECT_TRUE(Result::OK == ret || Result::NOT_SUPPORTED == ret)

          << "Expected OK or NOT_SUPPORTED, actual value: "

          << static_cast<int32_t>(static_cast<Result>(ret));

}

}





TEST_F(AudioEffectHidlTest, PrepareForProcessing) {

TEST_F(AudioEffectHidlTest, PrepareForProcessing) {

compatibility_matrix.xml

+136 −0
Original line number Original line Diff line number Diff line
@@ -2,62 +2,126 @@ 
    <hal format="hidl" optional="false">

    <hal format="hidl" optional="false">

        <name>android.hardware.audio</name>

        <name>android.hardware.audio</name>

        <version>2.0</version>

        <version>2.0</version>

        <interface>

            <name>IDevicesFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="false">

        <name>android.hardware.audio.effect</name>

        <name>android.hardware.audio.effect</name>

        <version>2.0</version>

        <version>2.0</version>

        <interface>

            <name>IEffectsFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.biometrics.fingerprint</name>

        <name>android.hardware.biometrics.fingerprint</name>

        <version>2.1</version>

        <version>2.1</version>

        <interface>

            <name>IBiometricsFingerprint</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.bluetooth</name>

        <name>android.hardware.bluetooth</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IBluetoothHci</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.boot</name>

        <name>android.hardware.boot</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IBootControl</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.camera.provider</name>

        <name>android.hardware.camera.provider</name>

        <version>2.4</version>

        <version>2.4</version>

        <interface>

            <name>ICameraProvider</name>

            <instance>legacy/0</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="false">

        <name>android.hardware.configstore</name>

        <name>android.hardware.configstore</name>

        <version>1.0-1</version>

        <version>1.0-1</version>

        <interface>

            <name>ISurfaceFlingerConfigs</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.contexthub</name>

        <name>android.hardware.contexthub</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IContexthub</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="false">

        <name>android.hardware.drm</name>

        <name>android.hardware.drm</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>ICryptoFactory</name>

            <instance>default</instance>

        </interface>

        <interface>

            <name>IDrmFactory</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.dumpstate</name>

        <name>android.hardware.dumpstate</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IDumpstateDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="false">

        <name>android.hardware.gatekeeper</name>

        <name>android.hardware.gatekeeper</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IGatekeeper</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.gnss</name>

        <name>android.hardware.gnss</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IGnss</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="false">

        <name>android.hardware.graphics.allocator</name>

        <name>android.hardware.graphics.allocator</name>

        <version>2.0</version>

        <version>2.0</version>

        <interface>

            <name>IAllocator</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="false">

        <name>android.hardware.graphics.composer</name>

        <name>android.hardware.graphics.composer</name>

        <version>2.1</version>

        <version>2.1</version>

        <interface>

            <name>IComposer</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="false">

        <name>android.hardware.graphics.mapper</name>

        <name>android.hardware.graphics.mapper</name>

        <version>2.0</version>

        <version>2.0</version>

        <interface>

            <name>IMapper</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.ir</name>

        <name>android.hardware.ir</name>
@@ -66,61 +130,133 @@ 
    <hal format="hidl" optional="false">

    <hal format="hidl" optional="false">

        <name>android.hardware.keymaster</name>

        <name>android.hardware.keymaster</name>

        <version>3.0</version>

        <version>3.0</version>

        <interface>

            <name>IKeymasterDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.light</name>

        <name>android.hardware.light</name>

        <version>2.0</version>

        <version>2.0</version>

        <interface>

            <name>ILight</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="false">

        <name>android.hardware.media.omx</name>

        <name>android.hardware.media.omx</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IOmx</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.memtrack</name>

        <name>android.hardware.memtrack</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IMemtrack</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.nfc</name>

        <name>android.hardware.nfc</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>INfc</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.power</name>

        <name>android.hardware.power</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IPower</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.radio</name>

        <name>android.hardware.radio</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IRadio</name>

            <instance>slot1</instance>

        </interface>

        <interface>

            <name>ISap</name>

            <instance>slot1</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.radio.deprecated</name>

        <version>1.0</version>

        <interface>

            <name>IOemHook</name>

            <instance>slot1</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.renderscript</name>

        <name>android.hardware.renderscript</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IDevice</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.sensors</name>

        <name>android.hardware.sensors</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>ISensors</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.soundtrigger</name>

        <name>android.hardware.soundtrigger</name>

        <version>2.0</version>

        <version>2.0</version>

        <interface>

            <name>ISoundTriggerHw</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.thermal</name>

        <name>android.hardware.thermal</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IThermal</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.usb</name>

        <name>android.hardware.usb</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IUsb</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.vibrator</name>

        <name>android.hardware.vibrator</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IVibrator</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.vr</name>

        <name>android.hardware.vr</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IVr</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

    <hal format="hidl" optional="true">

    <hal format="hidl" optional="true">

        <name>android.hardware.wifi</name>

        <name>android.hardware.wifi</name>

        <version>1.0</version>

        <version>1.0</version>

        <interface>

            <name>IWifi</name>

            <instance>default</instance>

        </interface>

    </hal>

    </hal>

</compatibility-matrix>
 
</compatibility-matrix>

current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -130,7 +130,7 @@ deee1dc4948f33af207e1008aba0f6cc07afb7900eab53f33192c8cac137eefc android.hardwar 
efc83df3f962b93c7c0290d691d7d300dabe12683e2cde3591fb3c0beedce20f android.hardware.power@1.0::types

efc83df3f962b93c7c0290d691d7d300dabe12683e2cde3591fb3c0beedce20f android.hardware.power@1.0::types

9b5aa499ec3b4226f15f48f5ed08896e2fc0676f978c9e199c1da21daaf002a6 android.hardware.radio@1.0::IRadio

9b5aa499ec3b4226f15f48f5ed08896e2fc0676f978c9e199c1da21daaf002a6 android.hardware.radio@1.0::IRadio

5c8efbb9c451a59737ed2c6c20230aae4745839ca01d8088d6dcc9020e52d2c5 android.hardware.radio@1.0::IRadioIndication

5c8efbb9c451a59737ed2c6c20230aae4745839ca01d8088d6dcc9020e52d2c5 android.hardware.radio@1.0::IRadioIndication

2b963c12b5b6961a6fcec6e6cbe3ed6cc8c4a7e95916c4947d8196d56aa57ec2 android.hardware.radio@1.0::IRadioResponse

c5f22264a31562e009bb284287051b7998fc46cd3294df61c9e6a1d622184993 android.hardware.radio@1.0::IRadioResponse

de3ab9f73b1073cd677b19d886fb927e9381b30161a704712d2b30f875873f5c android.hardware.radio@1.0::ISap

de3ab9f73b1073cd677b19d886fb927e9381b30161a704712d2b30f875873f5c android.hardware.radio@1.0::ISap

d183e406ef0897df2117a9dde384e8e6ea4fa6ab1c7f6f28e65b87011218c9ea android.hardware.radio@1.0::ISapCallback

d183e406ef0897df2117a9dde384e8e6ea4fa6ab1c7f6f28e65b87011218c9ea android.hardware.radio@1.0::ISapCallback

96986fbd22f0e6ca752e1fcdc0a64bda213995a81f5f36bc4faf3532d9306b97 android.hardware.radio@1.0::types

96986fbd22f0e6ca752e1fcdc0a64bda213995a81f5f36bc4faf3532d9306b97 android.hardware.radio@1.0::types

radio/1.0/IRadioResponse.hal

+10 −3
Original line number Original line Diff line number Diff line
@@ -102,8 +102,13 @@ interface IRadioResponse { 
     *

     *

     * Valid errors returned:

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE (radio resetting)

     *   RadioError:PASSWORD_INCORRECT (code is invalid)

     *   RadioError:PASSWORD_INCORRECT (code is invalid)

     *   RadioError:NO_MEMORY

     *   RadioError:INVALID_SIM_STATE

     *   RadioError:INTERNAL_ERR

     *   RadioError:SYSTEM_ERR

     *   RadioError:MODEM_ERR

     *   RadioError:INVALID_ARGUMENTS

     */

     */

    oneway supplyNetworkDepersonalizationResponse(RadioResponseInfo info, int32_t remainingRetries);

    oneway supplyNetworkDepersonalizationResponse(RadioResponseInfo info, int32_t remainingRetries);
@@ -1119,9 +1124,11 @@ interface IRadioResponse { 
     *

     *

     * Valid errors returned:

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:NO_MEMORY

     *   RadioError:INTERNAL_ERR

     *   RadioError:SYSTEM_ERR

     *   RadioError:MODEM_ERR

     *   RadioError:INVALID_ARGUMENTS

     *   RadioError:INVALID_ARGUMENTS

     *   RadioError:OPERATION_NOT_ALLOWED

     */

     */

    oneway handleStkCallSetupRequestFromSimResponse(RadioResponseInfo info);

    oneway handleStkCallSetupRequestFromSimResponse(RadioResponseInfo info);