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

Commit 3529942a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change the wait time of setDefaultLauncher from 20s to 60s" into... 

Merge "Change the wait time of setDefaultLauncher from 20s to 60s" into android13-tests-dev am: 47dd6d72 am: 26e6bddf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2455828



Change-Id: I453a5e8c70fb0fc3511fd71ec4fbb712d305253d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb8a2bf7 26e6bddf

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

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ public class ShortcutManagerTestUtils { 
                + instrumentation.getContext().getUserId() + " " + RoleManager.ROLE_HOME + " "

                + packageName + " 0");

        waitUntil("Failed to get shortcut access",

                () -> hasShortcutAccess(instrumentation, packageName), 20);

                () -> hasShortcutAccess(instrumentation, packageName), 60);

    }



    public static void setDefaultLauncher(Instrumentation instrumentation, Context packageContext) {