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>
This commit is contained in:
David Drysdale
2023-03-09 08:25:27 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 2 deletions

View File

@@ -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_;
};

View File

@@ -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,