From 926e83a4f64932ba84e806f07306074f1a301af3 Mon Sep 17 00:00:00 2001 From: Sergii Iegorov Date: Thu, 28 Nov 2019 16:33:39 +0200 Subject: [PATCH] Fix CtsShortcutHostTestCases#testSecondaryUser This patch uses Instrumentation parameter inside getDefaultLauncher function to obtain user ID from it and get default launcher namely for that user as setDefaultLauncher function sets launcher for the user from Instrumentation context. This fixes incorrect launcher settings for the cases that use two sequential calls to get/set default launcher. Bug: 145774461 Test: run cts -m CtsShortcutHostTestCases -t \ android.content.pm.cts.shortcuthost.ShortcutManagerMultiuserTest#testSecondaryUser Signed-off-by: Sergii Iegorov Change-Id: I8941f5648ad783c7681fdb56677e855756db957d --- .../pm/shortcutmanagertest/ShortcutManagerTestUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 2077ecb2799e9..96c69af036b65 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 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());