diff options
| author | Andy Quan <andyq@google.com> | 2023-06-02 14:49:35 -0700 |
|---|---|---|
| committer | Andy Quan <andyq@google.com> | 2023-06-02 14:49:35 -0700 |
| commit | bd751238fade1f933deefdb34ba13fc8f868646b (patch) | |
| tree | 1ff3736c7ff7a0a1d384207257fe8d16efd49bc0 /tests/grp_pwd_test.cpp | |
| parent | 129a265ab9467876da85d6162558d348cdf0ba7c (diff) | |
| parent | e2b2fd5475b5da5866e481bd5b72ef4333032792 (diff) | |
DO NOT MERGE - Merge tm-qpr3-release TQ3A.230605.010 into tm-platform-merge
Bug: 279962103
Change-Id: Icc5770772d20fd701183efbdbf7855497483a2cd
Diffstat (limited to 'tests/grp_pwd_test.cpp')
| -rw-r--r-- | tests/grp_pwd_test.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/grp_pwd_test.cpp b/tests/grp_pwd_test.cpp index bf65720f9..65a54a659 100644 --- a/tests/grp_pwd_test.cpp +++ b/tests/grp_pwd_test.cpp @@ -441,6 +441,17 @@ static void expect_ids(T ids, bool is_group) { } return result; }; + + // AID_PRNG_SEEDER (1092) was added in TM-QPR2, but CTS is shared + // across Android 13 versions so we may or may not find it in this + // test (b/253185870). + if (android::base::GetIntProperty("ro.build.version.sdk", 0) == __ANDROID_API_T__) { +#ifndef AID_PRNG_SEEDER +#define AID_PRNG_SEEDER 1092 +#endif + ids.erase(AID_PRNG_SEEDER); + expected_ids.erase(AID_PRNG_SEEDER); + } EXPECT_EQ(expected_ids, ids) << return_differences(); } #endif |