Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1167d30 authored by Mike Tsao's avatar Mike Tsao Committed by android-build-merger
Browse files

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

am: 3244faae

Change-Id: Ia494631b64d9cd670ac0045e2e8e9e9a5fa52bcc
parents 302c49a5 3244faae

services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java

+6 −6
Original line number Diff line number Diff line
@@ -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