Revert "Move Nearby to the front of the app list."

This reverts commit cd42caeb00aa0bdd33f565816bdbfb46ccbbad24.

Reason for revert: ACA session : https://android-build.googleplex.com/builds/culprit-assistant/run/4189ac3b-b57c-43f8-acb6-3467d8140574 
Bug id: b/278790605

Change-Id: I3398de7f7699a129f47cb047ce206493931aa00e

2 files changed, 23 insertions, 52 deletions

diff --git a/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt b/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
index a7273a86..7b9a0ce6 100644
--- a/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
+++ b/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
@@ -53,6 +53,7 @@ class ChooserContentPreviewUiTest {
     private val actionFactory = object : ActionFactory {
         override fun createCopyButton() = ActionRow.Action(label = "Copy", icon = null) {}
         override fun createEditButton(): ActionRow.Action? = null
+        override fun createNearbyButton(): ActionRow.Action? = null
         override fun createCustomActions(): List<ActionRow.Action> = emptyList()
         override fun getModifyShareAction(): ActionRow.Action? = null
         override fun getExcludeSharedTextAction(): Consumer<Boolean> = Consumer<Boolean> {}
diff --git a/java/tests/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java b/java/tests/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java
index 5f0ead7b..892a2e28 100644
--- a/java/tests/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java
+++ b/java/tests/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java
@@ -40,82 +40,52 @@ public class AbstractResolverComparatorTest {
 
     @Test
     public void testPinned() {
-        ResolvedComponentInfo r1 = createResolvedComponentInfo(
-                new ComponentName("package", "class"));
+        ResolvedComponentInfo r1 = new ResolvedComponentInfo(
+                new ComponentName("package", "class"), new Intent(), new ResolveInfo()
+        );
         r1.setPinned(true);
 
-        ResolvedComponentInfo r2 = createResolvedComponentInfo(
-                new ComponentName("zackage", "zlass"));
+        ResolvedComponentInfo r2 = new ResolvedComponentInfo(
+                new ComponentName("zackage", "zlass"), new Intent(), new ResolveInfo()
+        );
 
         Context context = InstrumentationRegistry.getTargetContext();
-        AbstractResolverComparator comparator = getTestComparator(context, null);
+        AbstractResolverComparator comparator = getTestComparator(context);
 
         assertEquals("Pinned ranks over unpinned", -1, comparator.compare(r1, r2));
         assertEquals("Unpinned ranks under pinned", 1, comparator.compare(r2, r1));
     }
 
+
     @Test
     public void testBothPinned() {
-        ResolvedComponentInfo r1 = createResolvedComponentInfo(
-                new ComponentName("package", "class"));
+        ResolveInfo pmInfo1 = new ResolveInfo();
+        pmInfo1.activityInfo = new ActivityInfo();
+        pmInfo1.activityInfo.packageName = "aaa";
+
+        ResolvedComponentInfo r1 = new ResolvedComponentInfo(
+                new ComponentName("package", "class"), new Intent(), pmInfo1);
         r1.setPinned(true);
 
-        ResolvedComponentInfo r2 = createResolvedComponentInfo(
-                new ComponentName("zackage", "zlass"));
+        ResolveInfo pmInfo2 = new ResolveInfo();
+        pmInfo2.activityInfo = new ActivityInfo();
+        pmInfo2.activityInfo.packageName = "zzz";
+        ResolvedComponentInfo r2 = new ResolvedComponentInfo(
+                new ComponentName("zackage", "zlass"), new Intent(), pmInfo2);
         r2.setPinned(true);
 
         Context context = InstrumentationRegistry.getTargetContext();
-        AbstractResolverComparator comparator = getTestComparator(context, null);
+        AbstractResolverComparator comparator = getTestComparator(context);
 
         assertEquals("Both pinned should rank alphabetically", -1, comparator.compare(r1, r2));
     }
 
-    @Test
-    public void testPromoteToFirst() {
-        ComponentName promoteToFirst = new ComponentName("promoted-package", "class");
-        ResolvedComponentInfo r1 = createResolvedComponentInfo(promoteToFirst);
-
-        ResolvedComponentInfo r2 = createResolvedComponentInfo(
-                new ComponentName("package", "class"));
-
-        Context context = InstrumentationRegistry.getTargetContext();
-        AbstractResolverComparator comparator = getTestComparator(context, promoteToFirst);
-
-        assertEquals("PromoteToFirst ranks over non-cemented", -1, comparator.compare(r1, r2));
-        assertEquals("Non-cemented ranks under PromoteToFirst", 1, comparator.compare(r2, r1));
-    }
-
-    @Test
-    public void testPromoteToFirstOverPinned() {
-        ComponentName cementedComponent = new ComponentName("promoted-package", "class");
-        ResolvedComponentInfo r1 = createResolvedComponentInfo(cementedComponent);
-
-        ResolvedComponentInfo r2 = createResolvedComponentInfo(
-                new ComponentName("package", "class"));
-        r2.setPinned(true);
-
-        Context context = InstrumentationRegistry.getTargetContext();
-        AbstractResolverComparator comparator = getTestComparator(context, cementedComponent);
-
-        assertEquals("PromoteToFirst ranks over pinned", -1, comparator.compare(r1, r2));
-        assertEquals("Pinned ranks under PromoteToFirst", 1, comparator.compare(r2, r1));
-    }
-
-    private ResolvedComponentInfo createResolvedComponentInfo(ComponentName component) {
-        ResolveInfo info = new ResolveInfo();
-        info.activityInfo = new ActivityInfo();
-        info.activityInfo.packageName = component.getPackageName();
-        info.activityInfo.name = component.getClassName();
-        return new ResolvedComponentInfo(component, new Intent(), info);
-    }
-
-    private AbstractResolverComparator getTestComparator(
-            Context context, ComponentName promoteToFirst) {
+    private AbstractResolverComparator getTestComparator(Context context) {
         Intent intent = new Intent();
 
         AbstractResolverComparator testComparator =
                 new AbstractResolverComparator(context, intent,
-                        Lists.newArrayList(context.getUser()), promoteToFirst) {
+                        Lists.newArrayList(context.getUser())) {
 
                     @Override
                     int compare(ResolveInfo lhs, ResolveInfo rhs) {