Merge "CTS: allow continue to use the old AIDs on devices launch with P" am: 8828e8ba3a am: ecb0c06a39
am: ed68664368
Change-Id: Iad289250b79151b9c62ff881e6773bc9ffd1fc8e
diff --git a/tests/grp_pwd_test.cpp b/tests/grp_pwd_test.cpp
index 1c36dcf..ca34205 100644
--- a/tests/grp_pwd_test.cpp
+++ b/tests/grp_pwd_test.cpp
@@ -250,7 +250,9 @@
// 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;
}
@@ -584,6 +586,10 @@
TEST(pwd, vendor_prefix_users) {
#if defined(__BIONIC__)
+ if (android::base::GetIntProperty("ro.product.first_api_level", 0) <= 28) {
+ return;
+ }
+
TestAidNamePrefix("/vendor/etc/passwd");
#else
print_no_getpwnam_test_info();
@@ -592,6 +598,10 @@
TEST(pwd, vendor_prefix_groups) {
#if defined(__BIONIC__)
+ if (android::base::GetIntProperty("ro.product.first_api_level", 0) <= 28) {
+ return;
+ }
+
TestAidNamePrefix("/vendor/etc/group");
#else
print_no_getgrnam_test_info();