aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuwei Xu <xucw@motorola.com>2018-10-29 13:44:03 +0800
committerChuwei Xu <xucw@motorola.com>2018-10-29 13:44:03 +0800
commit13950da037a0cad6f7a931664775c3dd9827ecf7 (patch)
treef0fa470ff6c06b06b61cdb85dc314965420a84c9
parentd7fd248ce1f15f022959bca642a9fa7cbd198d28 (diff)
downloadbionic-13950da037a0cad6f7a931664775c3dd9827ecf7.tar.gz
CTS: allow continue to use the old AIDs on devices launch with P
Some vendors may have been using the AIDs outside the oem ranges for long that those aids need continue to be maitained for the existing devices. We allow them countinue to use the old AID names and values on device launch with P and before, to give them the preiod of time to adopt the new AID scheme. Bug: 116405200 Change-Id: Ifd0a452711e20b856adf54fb20e71b23c9636e00
-rw-r--r--tests/grp_pwd_test.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/grp_pwd_test.cpp b/tests/grp_pwd_test.cpp
index 7474d565b..2cf502332 100644
--- a/tests/grp_pwd_test.cpp
+++ b/tests/grp_pwd_test.cpp
@@ -240,7 +240,9 @@ static void expect_ids(const T& ids) {
// Upgrading devices launched before API level 28 may not comply with the below check.
// Due to the difficulty in changing uids after launch, it is waived for these devices.
- if (android::base::GetIntProperty("ro.product.first_api_level", 0) < 28) {
+ // Also grant this check for device launched with 28(P) to give the vendor time to
+ // adopt the AID scheme.
+ if (android::base::GetIntProperty("ro.product.first_api_level", 0) <= 28) {
return;
}