commit e4065154db8680c63053b1f2ad8d26e269fd8f2a
author Nicholas Sauer <nicksauer@google.com> Mon Jan 14 10:05:54 2019 -0800
committer Nicholas Sauer <nicksauer@google.com> Mon Jan 14 11:18:48 2019 -0800
tree 7563141e1c47b8a5136620f0dfe861a258f7e484
parent b9fdc17992990aaba128915390dec168a0ce082a

Fix verifyDefaultValues for secondary users.

bug: 122832455
Test: cts-tradefed run cts-dev -a arm64-v8a -m CtsContentTestCases -t android.content.pm.cts.ApplicationInfoTest#verifyDefaultValues
on prod PI device, both primary and secondary user

Change-Id: Ic9738cf540afa0ad453dbffd0e0cc9380f80a823

tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java

diff --git a/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java b/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java
index a21039e..29c533c 100644
--- a/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java
@@ -36,6 +36,8 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Parcel;
+import android.os.Process;
+import android.os.UserHandle;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.StringBuilderPrinter;
@@ -153,14 +155,14 @@
         // The application "com.android.cts.stub" does not have any attributes set
         mApplicationInfo = getContext().getPackageManager().getApplicationInfo(
                 SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME, 0);
+        int currentUserId = Process.myUserHandle().getIdentifier();
 
         assertNull(mApplicationInfo.className);
         assertNull(mApplicationInfo.permission);
         assertEquals(SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME, mApplicationInfo.packageName);
         assertEquals(SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME, mApplicationInfo.processName);
         assertEquals(SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME, mApplicationInfo.taskAffinity);
-        assertTrue(FIRST_APPLICATION_UID <= mApplicationInfo.uid
-                && LAST_APPLICATION_UID >= mApplicationInfo.uid);
+        assertTrue(UserHandle.isApp(mApplicationInfo.uid));
         assertEquals(0, mApplicationInfo.theme);
         assertEquals(0, mApplicationInfo.requiresSmallestWidthDp);
         assertEquals(0, mApplicationInfo.compatibleWidthLimitDp);
@@ -169,11 +171,11 @@
         assertEquals(mApplicationInfo.sourceDir, mApplicationInfo.publicSourceDir);
         assertNull(mApplicationInfo.splitSourceDirs);
         assertArrayEquals(mApplicationInfo.splitSourceDirs, mApplicationInfo.splitPublicSourceDirs);
-        assertEquals("/data/user/0/" + SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME,
+        assertEquals("/data/user/" + currentUserId + "/" + SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME,
                 mApplicationInfo.dataDir);
-        assertEquals("/data/user_de/0/" + SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME,
+        assertEquals("/data/user_de/" + currentUserId + "/" + SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME,
                 mApplicationInfo.deviceProtectedDataDir);
-        assertEquals("/data/user/0/" + SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME,
+        assertEquals("/data/user/" + currentUserId + "/" + SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME,
                 mApplicationInfo.credentialProtectedDataDir);
         assertNull(mApplicationInfo.sharedLibraryFiles);
         assertTrue(mApplicationInfo.enabled);