commit 6f57774d22db103ac92b8c70e8b1e6b80843eb09
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 20 19:34:01 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 20 19:34:01 2020 +0000
tree 757b77641b5f3f2c9a87b3f84f36de3cc69337a2
parent f6b4389da90d549796e1b9fd95a40d24b1f6af56
parent 75338fd4ab4160265613906fddaf5908a480251c

[automerger skipped] Merge "Merge redfin/bramble support." am: 01e833073e -s ours am: 75338fd4ab -s ours

am skip reason: Change-Id I93903c258f834a9e9537b88882d77a6660482638 with SHA-1 2ef7e39983 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1465939

Change-Id: Id0a423d4ba56a56c311d17aaf3c130ef09a4e9fd

robolectric_tests/src/com/android/launcher3/model/LoaderCursorTest.java

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