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

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

Snap for 6993684 from 979039a4 to sc-release 

Change-Id: I07e6e29db5674f18bd2fbbe33fc3b43fd5fa9934
parents 33e38668 979039a4

current.txt

+4 −0
Original line number Diff line number Diff line
@@ -771,6 +771,10 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar 
6a271e493907e8ba20912e42771bd0d99ae45431a851d5675ef9496d02510a34 android.hardware.gnss@1.1::IGnssMeasurementCallback

2c331a9605f3a08d9c1e0a36169ca57758bc43c11a78ef3f3730509885e52c15 android.hardware.graphics.composer@2.4::IComposerClient

3da3ce039247872d95c6bd48621dbfdfa1c2d2a91a90f257862f87ee2bc46300 android.hardware.health@2.1::types

9679f27a42f75781c8993ef163ed92808a1928de186639834841d0b8e326e63d android.hardware.gatekeeper@1.0::IGatekeeper

40456eb90ea88b62d18ad3fbf1da8917981cd55ac04ce69c8e058d49ff5beff4 android.hardware.keymaster@3.0::IKeymasterDevice

6017b4f2481feb0fffceae81c62bc372c898998b2d8fe69fbd39859d3a315e5e android.hardware.keymaster@4.0::IKeymasterDevice

dabe23dde7c9e3ad65c61def7392f186d7efe7f4216f9b6f9cf0863745b1a9f4 android.hardware.keymaster@4.1::IKeymasterDevice

cd84ab19c590e0e73dd2307b591a3093ee18147ef95e6d5418644463a6620076 android.hardware.neuralnetworks@1.2::IDevice

9625e85f56515ad2cf87b6a1847906db669f746ea4ab02cd3d4ca25abc9b0109 android.hardware.neuralnetworks@1.2::types

9e758e208d14f7256e0885d6d8ad0b61121b21d8c313864f981727ae55bffd16 android.hardware.neuralnetworks@1.3::types

gatekeeper/1.0/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -10,5 +10,5 @@ hidl_interface { 
    interfaces: [

        "android.hidl.base@1.0",

    ],

    gen_java: true,

    gen_java: false,

}

gatekeeper/1.0/IGatekeeper.hal

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package android.hardware.gatekeeper@1.0;



@SensitiveData

interface IGatekeeper {



/**

identity/support/src/IdentityCredentialSupport.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1023,11 +1023,12 @@ optional<vector<vector<uint8_t>>> createAttestation( 
    // relying party is ever going to trust our batch key and those keys above

    // it.

    //

    ::keymaster::PureSoftKeymasterContext context(KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT);

    ::keymaster::PureSoftKeymasterContext context(::keymaster::KmVersion::KEYMASTER_4_1,

                                                  KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT);



    error = generate_attestation_from_EVP(key, swEnforced, hwEnforced, auth_set, context,

                                          ::keymaster::kCurrentKeymasterVersion, *attestation_chain,

                                          *attestation_signing_key, &cert_chain_out);

                                          *attestation_chain, *attestation_signing_key,

                                          &cert_chain_out);



    if (KM_ERROR_OK != error || !cert_chain_out) {

        LOG(ERROR) << "Error generate attestation from EVP key" << error;
@@ -2402,7 +2403,6 @@ vector<vector<uint8_t>> chunkVector(const vector<uint8_t>& content, size_t maxCh 
    return ret;

}





vector<uint8_t> testHardwareBoundKey = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};



const vector<uint8_t>& getTestHardwareBoundKey() {

keymaster/3.0/IKeymasterDevice.hal

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package android.hardware.keymaster@3.0; 
 * Keymaster device definition.  For thorough documentation see the implementer's reference, at

 * https://source.android.com/security/keystore/implementer-ref.html

 */

@SensitiveData

interface IKeymasterDevice {



    /**