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

Commit 886a4bb6 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7389169 from d02d9f27 to sc-d1-release

Change-Id: I4d282efb09cbdea2e2edd6cd2675eb67d57b80cf
parents 28736be8 d02d9f27
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -60,8 +60,22 @@ vintf_compatibility_matrix {
    ],
}

vintf_compatibility_matrix {
    name: "framework_compatibility_matrix.6.xml",
    stem: "compatibility_matrix.6.xml",
    srcs: [
        "compatibility_matrix.6.xml",
    ],
    kernel_configs: [
        "kernel_config_s_4.19",
        "kernel_config_s_5.4",
        "kernel_config_s_5.10",
    ],
}

vintf_compatibility_matrix {
    name: "framework_compatibility_matrix.current.xml",
    enabled: false,
    stem: "compatibility_matrix.current.xml",
    srcs: [
        "compatibility_matrix.current.xml",
+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ my_system_matrix_deps := \
    framework_compatibility_matrix.3.xml \
    framework_compatibility_matrix.4.xml \
    framework_compatibility_matrix.5.xml \
    framework_compatibility_matrix.current.xml \
    framework_compatibility_matrix.6.xml \
    framework_compatibility_matrix.device.xml \

my_framework_matrix_deps += \
+650 −0

File added.

Preview size limit exceeded, changes collapsed.

+1 −1
Original line number Diff line number Diff line
<compatibility-matrix version="1.0" type="framework" level="6">
<compatibility-matrix version="1.0" type="framework" level="7">
    <hal format="hidl" optional="true">
        <name>android.hardware.atrace</name>
        <version>1.0</version>
+5 −4
Original line number Diff line number Diff line
@@ -318,10 +318,11 @@ interface IKeyMintDevice {
     * @param attestationKey, if provided, specifies the key that must be used to sign the
     *        attestation certificate.  If `keyParams` does not contain a Tag::ATTESTATION_CHALLENGE
     *        but `attestationKey` is non-null, the IKeyMintDevice must return
     *        ErrorCode::INVALID_ARGUMENT.  If the provided AttestationKey does not contain a key
     *        blob containing an asymmetric key with KeyPurpose::ATTEST_KEY, the IKeyMintDevice must
     *        return ErrorCode::INCOMPATIBLE_PURPOSE.  If the provided AttestationKey has an empty
     *        issuer subject name, the IKeyMintDevice must return ErrorCode::INVALID_ARGUMENT.
     *        ErrorCode::ATTESTATION_CHALLENGE_MISSING. If the provided AttestationKey does not
     *        contain a key blob containing an asymmetric key with KeyPurpose::ATTEST_KEY, the
     *        IKeyMintDevice must return ErrorCode::INCOMPATIBLE_PURPOSE.  If the provided
     *        AttestationKey has an empty issuer subject name, the IKeyMintDevice must return
     *        ErrorCode::INVALID_ARGUMENT.
     *
     *        If `attestationKey` is null and `keyParams` contains Tag::ATTESTATION_CHALLENGE but
     *        the KeyMint implementation does not have factory-provisioned attestation keys, it must
Loading