diff options
| author | 2023-02-24 11:58:09 +0000 | |
|---|---|---|
| committer | 2023-02-24 11:58:09 +0000 | |
| commit | 1d798b51c09561ba7f25fcc3f9406cd6cbce4e1b (patch) | |
| tree | 34fd6ea9da03d0818a57641b3a5ef5090afaf7dd | |
| parent | dd7364cda421a46db3c3559cff1e7ac935d615c8 (diff) | |
| parent | 1a7736be6383edc326f3c81dfc3d2c23a642cf6a (diff) | |
Merge "Change the wait time of setDefaultLauncher from 20s to 60s" am: f525d4093f am: 1a7736be63
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2452428
Change-Id: I54bbc031516d3c3d1f2046dc6077d619ad79a56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java index b921838e0bfc..4c0361d30d67 100644 --- a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java +++ b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java @@ -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) { |