commit ecb18a657390663e8428c652b8d2747786540706
author Xin Li <delphij@google.com> Mon Nov 23 17:13:54 2020 -0800
committer Xin Li <delphij@google.com> Mon Nov 23 17:13:54 2020 -0800
tree 735c0afd86fd219a9a5add9b4643851b12826b83
parent 75338fd4ab4160265613906fddaf5908a480251c
parent b3ab1189d25fe196734ed7a2020d97e2aaebac39

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: I56abeae5adec79a1c7bdad1a261f0f62c055cf2e
Change-Id: I2efd8b65312e25c5c96bf36b3c4a655baffe2eaa

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 3a252dc..9aa4a9e 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(), "dummy-do");
+        ComponentName cn = new ComponentName(mContext.getPackageName(), "placeholder-do");
         WorkspaceItemInfo info = Executors.MODEL_EXECUTOR.submit(() ->
                 mLoaderCursor.getAppShortcutInfo(
                         new Intent().setComponent(cn), true  /* allowMissingTarget */, true))