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

Commit b5fc2e67 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Add more utility methods for CTS

Also fix an exception message.

Bug 29612099

Change-Id: Id94656cd2701cf2bbc2883e45fba93ecae6d3148
parent 58a00115
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ public class LauncherAppsService extends SystemService {

        private void ensureShortcutPermission(@NonNull String callingPackage, int userId) {
            verifyCallingPackage(callingPackage);
            ensureInUserProfiles(userId, "Cannot start activity for unrelated profile " + userId);
            ensureInUserProfiles(userId, "Cannot access shortcuts for unrelated profile " + userId);

            if (!mShortcutServiceInternal.hasShortcutHostPermission(getCallingUserId(),
                    callingPackage)) {
+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := ShortcutManagerTestUtils

LOCAL_SDK_VERSION := current
LOCAL_SDK_VERSION := test_current

include $(BUILD_STATIC_JAVA_LIBRARY)
+7 −5
Original line number Diff line number Diff line
@@ -156,10 +156,11 @@ public class ShortcutManagerTestUtils {
        return result;
    }

    private static List<String> runCommand(Instrumentation instrumentation, String command) {
    public static List<String> runCommand(Instrumentation instrumentation, String command) {
        return runCommand(instrumentation, command, null);
    }
    private static List<String> runCommand(Instrumentation instrumentation, String command,

    public static List<String> runCommand(Instrumentation instrumentation, String command,
            Predicate<List<String>> resultAsserter) {
        Log.d(TAG, "Running command: " + command);
        final List<String> result;
@@ -175,11 +176,11 @@ public class ShortcutManagerTestUtils {
        return result;
    }

    private static void runCommandForNoOutput(Instrumentation instrumentation, String command) {
    public static void runCommandForNoOutput(Instrumentation instrumentation, String command) {
        runCommand(instrumentation, command, result -> result.size() == 0);
    }

    private static List<String> runShortcutCommand(Instrumentation instrumentation, String command,
    public static List<String> runShortcutCommand(Instrumentation instrumentation, String command,
            Predicate<List<String>> resultAsserter) {
        return runCommand(instrumentation, "cmd shortcut " + command, resultAsserter);
    }
@@ -204,7 +205,8 @@ public class ShortcutManagerTestUtils {
    }

    public static void setDefaultLauncher(Instrumentation instrumentation, String component) {
        runCommand(instrumentation, "cmd package set-home-activity " + component,
        runCommand(instrumentation, "cmd package set-home-activity --user "
                        + instrumentation.getContext().getUserId() + " " + component,
                result -> result.contains("Success"));
    }