Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" into android10-tests-dev

Browse Source
This commit is contained in:
Treehugger Robot
2020-04-08 00:53:18 +00:00
committed by Gerrit Code Review
parent a13af898bd 45b9071670
commit d200d089df
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
View File

@@ -197,7 +197,8 @@ public class ShortcutManagerTestUtils {
final String PREFIX = "Launcher: ComponentInfo{"; final String PREFIX = "Launcher: ComponentInfo{";
final String POSTFIX = "}"; final String POSTFIX = "}";
final List<String> result = runShortcutCommandForSuccess( final List<String> result = runShortcutCommandForSuccess(
instrumentation, "get-default-launcher"); instrumentation, "get-default-launcher --user "
+ instrumentation.getContext().getUserId());
for (String s : result) { for (String s : result) {
if (s.startsWith(PREFIX) && s.endsWith(POSTFIX)) { if (s.startsWith(PREFIX) && s.endsWith(POSTFIX)) {
return s.substring(PREFIX.length(), s.length() - POSTFIX.length()); return s.substring(PREFIX.length(), s.length() - POSTFIX.length());