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

Commit 1a7736be 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" am: f525d409 

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



Change-Id: I962b3d68e98c2185fa6de09472cce83b2b810d70
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a297d5d f525d409

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) {