Merge "Improved ShortcutManagerTestUtils. getDefaultLauncher() in case of error." into sc-dev (120baf0f) · Commits · e / os / android_frameworks_base

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;
		}