| commit | a0c6eef63d08b3916f7ac9b091a315b74b697029 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Mar 09 08:56:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 09 08:56:29 2023 +0000 |
| tree | 234554fb9f0ab65500b589b7bfa6602c3f7e0653 | |
| parent | 940fdedd634269092bb968802e03a4358cd22aa8 [diff] | |
| parent | 257e32b6b08296f63830dc2bc1eecddfb3dece19 [diff] |
Merge "Allow for 32-bit VTS builds" am: 5196f93ae1 am: 257e32b6b0 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2474566 Change-Id: I88fc07367787c7a8aa400bd64b905014e943009e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/aidl/vts/functional/AuthTest.cpp b/security/keymint/aidl/vts/functional/AuthTest.cpp index a31ac01..78c88f4 100644 --- a/security/keymint/aidl/vts/functional/AuthTest.cpp +++ b/security/keymint/aidl/vts/functional/AuthTest.cpp
@@ -274,7 +274,7 @@ std::shared_ptr<ISecureClock> clock_; string password_; uint32_t uid_; - long sid_; + int64_t sid_; std::vector<uint8_t> handle_; };
diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h index a6a9df6..3c753d1 100644 --- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h +++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h
@@ -356,7 +356,7 @@ SecurityLevel securityLevel_; string name_; string author_; - long challenge_; + int64_t challenge_; private: void CheckEncryptOneByteAtATime(BlockMode block_mode, const int block_size,