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

Commit 4a9e4d4b authored by Felipe Leme's avatar Felipe Leme Committed by Automerger Merge Worker
Browse files

Merge "Improved ShortcutManagerTestUtils. getDefaultLauncher() in case of... 

Merge "Improved ShortcutManagerTestUtils. getDefaultLauncher() in case of error." into sc-dev am: 120baf0f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13831006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie64647baef99b3c0b78e34ba6c4e32a4fbcedab1
parents 6a382412 120baf0f

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;

    }