commit ecb0c06a39cbd46c48517f760cf6dd404ccc6b7a
author Tom Cherry <tomcherry@google.com> Tue Oct 23 13:29:45 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 23 13:29:45 2018 -0700
tree ac08eb4ebf312846996df3908ec5c8b4681e03ec
parent 7566024720c637fb95834026fc4064ae7cf92f33
parent 8828e8ba3a715a92f96afd21dbfe2e13eb82332e

Merge "CTS: allow continue to use the old AIDs on devices launch with P"
am: 8828e8ba3a

Change-Id: I24084d13e438eccf5151d966f7807c88a4996ed6

tests/grp_pwd_test.cpp

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();