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

Commit 257e32b6 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Allow for 32-bit VTS builds" am: 5196f93a 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2474566



Change-Id: I6f992cc6cdc1e18101f9af6e35f92bc3647d2ff3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 92a2820f 5196f93a

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

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ class AuthTest : public KeyMintAidlTestBase { 
    std::shared_ptr<ISecureClock> clock_;

    string password_;

    uint32_t uid_;

    long sid_;

    int64_t sid_;

    std::vector<uint8_t> handle_;

};

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ class KeyMintAidlTestBase : public ::testing::TestWithParam<string> { 
    SecurityLevel securityLevel_;

    string name_;

    string author_;

    long challenge_;

    int64_t challenge_;



  private:

    void CheckEncryptOneByteAtATime(BlockMode block_mode, const int block_size,