| commit | 257e32b6b08296f63830dc2bc1eecddfb3dece19 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Mar 09 08:25:27 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 09 08:25:27 2023 +0000 |
| tree | 7549794d30f4783c876faf1e62dca05e679dd9c5 | |
| parent | 92a2820fb74e3e05d825a4cdd6065453212c2088 [diff] | |
| parent | 5196f93ae1c4aa5f797bc5646f33f246f7cc0c63 [diff] |
Merge "Allow for 32-bit VTS builds" am: 5196f93ae1 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2474566 Change-Id: I6f992cc6cdc1e18101f9af6e35f92bc3647d2ff3 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,