Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21e84d80 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" am: 06ad45a5 am:... 

Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" am: 06ad45a5 am: 8ff2a450 am: 6fd0492e am: 7e125b30 am: a288ed02

Change-Id: Iaeeee111b92e1ff2e4d62f9361661e6df609fbf1
parents d52074a7 a288ed02

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

+2 −1
Original line number Diff line number Diff line
@@ -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());