Fix RequestPinAppWidgetTest correctly restore launcher in multi-user
"cmd shortcut get-default-launcher" requires --user option, otherwise it
always returns for system user.
Bug: 418866117
Test: RequestPinAppWidgetTest
Flag: EXEMPT bugfix
Change-Id: Icb472d362a1fc2b407a5a397cf543b18bc3a5e5c
diff --git a/tests/tests/appwidget/src/android/appwidget/cts/RequestPinAppWidgetTest.java b/tests/tests/appwidget/src/android/appwidget/cts/RequestPinAppWidgetTest.java
index bf09504..c1a014c 100644
--- a/tests/tests/appwidget/src/android/appwidget/cts/RequestPinAppWidgetTest.java
+++ b/tests/tests/appwidget/src/android/appwidget/cts/RequestPinAppWidgetTest.java
@@ -158,7 +158,8 @@
private String getDefaultLauncher() throws Exception {
final String PREFIX = "Launcher: ComponentInfo{";
final String POSTFIX = "}";
- for (String s : runShellCommand("cmd shortcut get-default-launcher")) {
+ for (String s : runShellCommand("cmd shortcut get-default-launcher --user "
+ + getInstrumentation().getContext().getUserId())) {
if (s.startsWith(PREFIX) && s.endsWith(POSTFIX)) {
return s.substring(PREFIX.length(), s.length() - POSTFIX.length());
}
@@ -171,8 +172,6 @@
+ getInstrumentation().getContext().getUserId() + " " + component);
runShellCommand("cmd package set-home-activity --user "
+ getInstrumentation().getContext().getUserId() + " " + component);
- /*runShellCommand("cmd package set-home-activity "
- + component);*/
}
@Test
