| commit | f6b4389da90d549796e1b9fd95a40d24b1f6af56 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Oct 13 03:50:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 13 03:50:59 2020 +0000 |
| tree | 757b77641b5f3f2c9a87b3f84f36de3cc69337a2 | |
| parent | dbae408d09e9e5eab04d0ab145a575d1c1adb023 [diff] | |
| parent | 2ef7e3998372ea8ea6ebb539bc4b8ec2486b5573 [diff] |
[automerger skipped] Merge ab/6749736 in stage. am: 2ef7e39983 -s ours am skip reason: Change-Id Id9c756552c08d7690b99987dafadc13448a0c236 with SHA-1 0581f5b05b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12804054 Change-Id: I5c166c4b778272882283ec85d5945912abf52f7a
diff --git a/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java b/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java index 9aa4a9e..3a252dc 100644 --- a/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java +++ b/robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java
@@ -136,7 +136,7 @@ initCursor(ITEM_TYPE_APPLICATION, ""); assertTrue(mLoaderCursor.moveToNext()); - ComponentName cn = new ComponentName(mContext.getPackageName(), "placeholder-do"); + ComponentName cn = new ComponentName(mContext.getPackageName(), "dummy-do"); WorkspaceItemInfo info = Executors.MODEL_EXECUTOR.submit(() -> mLoaderCursor.getAppShortcutInfo( new Intent().setComponent(cn), true /* allowMissingTarget */, true))