Merge "Cleanup that wasn't uploaded with ag/2094132" into oc-dev

This commit is contained in:
TreeHugger Robot
2017-04-17 23:53:49 +00:00
committed by Android (Google) Code Review

View File

@@ -71,17 +71,17 @@ public class PackageManagerServiceTest extends AndroidTestCase {
"primaryCpuAbiString", "secondaryCpuAbiString", "primaryCpuAbiString", "secondaryCpuAbiString",
"cpuAbiOverrideString", 0, 0, 0, "parentPackageName", null, 0, "cpuAbiOverrideString", 0, 0, 0, "parentPackageName", null, 0,
null, null); null, null);
pri.removedUsers = new int[] {1, 2, 3, 4, 5}; pri.populateUsers(new int[] {1, 2, 3, 4, 5}, setting);
pri.populateUsers(pri.removedUsers, setting);
assertNotNull(pri.broadcastUsers); assertNotNull(pri.broadcastUsers);
assertEquals(pri.removedUsers.length, pri.broadcastUsers.length); assertEquals(5, pri.broadcastUsers.length);
// Exclude a user // Exclude a user
pri.broadcastUsers = null; pri.broadcastUsers = null;
setting.setInstantApp(true, 4); final int EXCLUDED_USER_ID = 4;
pri.populateUsers(pri.removedUsers, setting); setting.setInstantApp(true, EXCLUDED_USER_ID);
pri.populateUsers(new int[] {1, 2, 3, EXCLUDED_USER_ID, 5}, setting);
assertNotNull(pri.broadcastUsers); assertNotNull(pri.broadcastUsers);
assertEquals(pri.removedUsers.length - 1, pri.broadcastUsers.length); assertEquals(5 - 1, pri.broadcastUsers.length);
// TODO: test that sendApplicationHiddenForUser() actually fills in // TODO: test that sendApplicationHiddenForUser() actually fills in
// broadcastUsers // broadcastUsers