From 0a20cf7ca46e1d0dd75b084d2f4165369bd817fa Mon Sep 17 00:00:00 2001 From: Mike Tsao Date: Thu, 13 Apr 2017 16:19:28 -0700 Subject: [PATCH] Cleanup that wasn't uploaded with ag/2094132 I saw that Tree Hugger had verified, and hit submit without remembering to repo upload the last patch set containing toddke's most recent set of suggestions. Bug: 37192695 Test: runtest -c com.android.server.pm.PackageManagerServiceTest frameworks-services Change-Id: I4d6376165aaa615007891ba045c9b5c34e4b0394 (cherry picked from commit 338d332873c431c46057eae3c93ed79351ddd2e4) --- .../android/server/pm/PackageManagerServiceTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java index eadece27087bf..8f2f34ee77d9a 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java @@ -71,17 +71,17 @@ public class PackageManagerServiceTest extends AndroidTestCase { "primaryCpuAbiString", "secondaryCpuAbiString", "cpuAbiOverrideString", 0, 0, 0, "parentPackageName", null, 0, null, null); - pri.removedUsers = new int[] {1, 2, 3, 4, 5}; - pri.populateUsers(pri.removedUsers, setting); + pri.populateUsers(new int[] {1, 2, 3, 4, 5}, setting); assertNotNull(pri.broadcastUsers); - assertEquals(pri.removedUsers.length, pri.broadcastUsers.length); + assertEquals(5, pri.broadcastUsers.length); // Exclude a user pri.broadcastUsers = null; - setting.setInstantApp(true, 4); - pri.populateUsers(pri.removedUsers, setting); + final int EXCLUDED_USER_ID = 4; + setting.setInstantApp(true, EXCLUDED_USER_ID); + pri.populateUsers(new int[] {1, 2, 3, EXCLUDED_USER_ID, 5}, setting); assertNotNull(pri.broadcastUsers); - assertEquals(pri.removedUsers.length - 1, pri.broadcastUsers.length); + assertEquals(5 - 1, pri.broadcastUsers.length); // TODO: test that sendApplicationHiddenForUser() actually fills in // broadcastUsers