Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved ShortcutManagerTestUtils. getDefaultLauncher() in case of error.

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

Change-Id: I688dfbbf47aea000b2130324fc278ef914513563
This commit is contained in:
Felipe Leme
2021-03-10 15:53:06 -08:00
parent a47c17768c
commit 868c224eda
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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