summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-04-08 00:53:18 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-04-08 00:53:18 +0000
commitd200d089df63cc7b2d2a24531feb828b5357e60e (patch)
tree865e6df57fc75603da0c9c9e6027ed1e4225e22e
parenta13af898bd38e61fc991ae8b18d8db085cd7b7ae (diff)
parent45b9071670312fe62988e92977e5609273045cbb (diff)
downloadbase-android10-tests-dev.tar.gz
Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" into android10-tests-devandroid10-tests-dev
-rw-r--r--services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java3
1 files changed, 2 insertions, 1 deletions
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 2077ecb2799e..96c69af036b6 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 @@ 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());