commit | e99c113136147bab0d9d5ce9717793b9fbccaa5c | [log] [tgz] |
---|---|---|
author | android-build-prod (mdb) <android-build-team-robot@google.com> | Thu Apr 09 20:07:42 2020 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Apr 09 20:07:42 2020 +0000 |
tree | 865e6df57fc75603da0c9c9e6027ed1e4225e22e | |
parent | 366df52daac91afeb401ed6febc836a72ea94e8b [diff] | |
parent | 3355fb6dbfa904397272653aaf5a83e3866d42ed [diff] |
Merge "Snap for 6381431 from d200d089df63cc7b2d2a24531feb828b5357e60e to android10-tests-release" into android10-tests-release
diff --git a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java index 2077ecb..96c69af 100644 --- 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 @@ 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());