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

Commit 00e46261 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7514518 from 8b78dc50 to sc-d1-release 

Change-Id: Iad22dbb08d98ce086b96d5f7b874fcad4e018115
parents 86e780d4 8b78dc50

audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h

+8 −0
Original line number Diff line number Diff line
@@ -225,6 +225,14 @@ static inline bool isTelephonyDevice(const std::string& device) { 
    return isTelephonyDevice(stringToAudioDevice(device));

}



static inline bool isEchoReferenceDevice(AudioDevice device) {

    return device == AudioDevice::AUDIO_DEVICE_IN_ECHO_REFERENCE;

}



static inline bool isEchoReferenceDevice(const std::string& device) {

    return isEchoReferenceDevice(stringToAudioDevice(device));

}



static inline bool maybeVendorExtension(const std::string& s) {

    // Only checks whether the string starts with the "vendor prefix".

    static const std::string vendorPrefix = "VX_";

audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -710,7 +710,8 @@ class PcmOnlyConfigInputStreamTest : public InputStreamTest { 
        // Returning 'true' when no source is found so the test can fail later with a more clear

        // problem description.

        return !maybeSourceAddress.has_value() ||

               !xsd::isTelephonyDevice(maybeSourceAddress.value().deviceType);

               !(xsd::isTelephonyDevice(maybeSourceAddress.value().deviceType) ||

                 xsd::isEchoReferenceDevice(maybeSourceAddress.value().deviceType));

    }



    void createPatchIfNeeded() {

security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl

+4 −3
Original line number Diff line number Diff line
@@ -813,9 +813,10 @@ interface IKeyMintDevice { 
    byte[] convertStorageKeyToEphemeral(in byte[] storageKeyBlob);



    /**

     * Returns parameters associated with the provided key. This should match the

     * KeyCharacteristics present in the KeyCreationResult returned by generateKey(),

     * importKey(), or importWrappedKey().

     * Returns KeyMint-enforced parameters associated with the provided key. The returned tags are

     * a subset of KeyCharacteristics found in the KeyCreationResult returned by generateKey(),

     * importKey(), or importWrappedKey(). The returned value is a subset, as it does not include

     * any Keystore-enforced parameters.

     *

     * @param keyBlob The opaque descriptor returned by generateKey, importKey or importWrappedKey.

     *