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

Commit 868c224e authored by Felipe Leme's avatar Felipe Leme
Browse files

Improved ShortcutManagerTestUtils. getDefaultLauncher() in case of error. 

Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSuspendPackage,testSuspendPackageWithPackageManager
Bug: 182387060

Change-Id: I688dfbbf47aea000b2130324fc278ef914513563
parent a47c1776

services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java

+10 −2
Original line number Diff line number Diff line
@@ -243,10 +243,18 @@ public class ShortcutManagerTestUtils { 
        final UserHandle user = getParentUser(context);

        List<String> roleHolders = callWithShellPermissionIdentity(

                () -> roleManager.getRoleHoldersAsUser(RoleManager.ROLE_HOME, user));

        if (roleHolders.size() == 1) {

        int size = roleHolders.size();

        if (size == 1) {

            return roleHolders.get(0);

        }

        fail("Failed to get the default launcher for user " + context.getUserId());



        if (size > 1) {

            fail("Too many launchers for user " + user.getIdentifier() + " using role "

                    + RoleManager.ROLE_HOME + ": " + roleHolders);

        } else {

            fail("No default launcher for user " + user.getIdentifier() + " using role "

                    + RoleManager.ROLE_HOME);

        }

        return null;

    }