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

Commit 1f1d65c5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7821439 from c865a586 to tm-release 

Change-Id: I92622a5fab1e688188711903c7bb147bcc7057da
parents 1c4176d3 c865a586

automotive/vehicle/aidl/impl/Android.bp

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

    name: "VehicleHalDefaults",

    static_libs: [

        "android.hardware.automotive.vehicle-V1-ndk_platform",

        "android.hardware.automotive.vehicle-V1-ndk",

    ],

    shared_libs: [

        "libbase",

security/keymint/aidl/vts/functional/KeyMintTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -6340,7 +6340,7 @@ TEST_P(ClearOperationsTest, TooManyOperations) { 
    size_t i;



    for (i = 0; i < max_operations; i++) {

        result = Begin(KeyPurpose::ENCRYPT, key_blob_, params, &out_params, op_handles[i]);

        result = Begin(KeyPurpose::DECRYPT, key_blob_, params, &out_params, op_handles[i]);

        if (ErrorCode::OK != result) {

            break;

        }
@@ -6348,12 +6348,12 @@ TEST_P(ClearOperationsTest, TooManyOperations) { 
    EXPECT_EQ(ErrorCode::TOO_MANY_OPERATIONS, result);

    // Try again just in case there's a weird overflow bug

    EXPECT_EQ(ErrorCode::TOO_MANY_OPERATIONS,

              Begin(KeyPurpose::ENCRYPT, key_blob_, params, &out_params));

              Begin(KeyPurpose::DECRYPT, key_blob_, params, &out_params));

    for (size_t j = 0; j < i; j++) {

        EXPECT_EQ(ErrorCode::OK, Abort(op_handles[j]))

                << "Aboort failed for i = " << j << std::endl;

    }

    EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::ENCRYPT, key_blob_, params, &out_params));

    EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, key_blob_, params, &out_params));

    AbortIfNeeded();

}