Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" am: 06ad45a596 am: 8ff2a45090

Change-Id: I4e99539c54a6adc8a5b970c325f46e4b6f000ea5
2020-04-09 08:08:57 +00:00
parent aac2a05518 8ff2a45090
commit 6fd0492e3d
1 changed files with 2 additions and 1 deletions
--- a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
+++ b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
@@ -197,7 +197,8 @@ public class ShortcutManagerTestUtils {
        final String PREFIX = "Launcher: ComponentInfo{";
        final String POSTFIX = "}";
        final List<String> result = runShortcutCommandForSuccess(
-                instrumentation, "get-default-launcher");
+                instrumentation, "get-default-launcher --user "
+                + instrumentation.getContext().getUserId());
        for (String s : result) {
            if (s.startsWith(PREFIX) && s.endsWith(POSTFIX)) {
                return s.substring(PREFIX.length(), s.length() - POSTFIX.length());