summaryrefslogtreecommitdiff
path: root/java/tests/src
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2022-10-24 13:56:21 +0000
committer Matt Casey <mrcasey@google.com> 2022-10-27 20:57:40 +0000
commit9bcaf18b0fda7adb1a93c5d170e390bf3b7ce0e3 (patch)
tree15bf26f81f84f2dba6c9409dddc244ef8acce996 /java/tests/src
parent8d51b6f18d47cc6d019529a6b7f1938936d14b4a (diff)
Remove experiment code to promote nearby as 1st target
- Verified that we don't expect to do this experiment in U, nothing else was using this code so we can simplify. - Fix NPE that was hidden in the code (see bug). - Slight change to the excluded components behavior where the entire array given for EXTRA_EXCLUDE_COMPONENTS must be of type ComponentName[] otherwise it'll be ignored after logging an error. Relevant prior CLs: - ag/15527538 added this functionality (zzhen) - ag/17871086 added direct share pinning and modified some of these methods (songhu) Bug: 254895117 Test: atest AbstractResolverComparatorTest Test: atest CtsSharesheetDeviceTest (with flag enabled) Test: Manual verification that nearby component still hidden. Change-Id: I0306eb2547a2f60823d7c9d77d86e743d432fefc
Diffstat (limited to 'java/tests/src')
-rw-r--r--java/tests/src/com/android/intentresolver/AbstractResolverComparatorTest.java17
1 files changed, 0 insertions, 17 deletions
diff --git a/java/tests/src/com/android/intentresolver/AbstractResolverComparatorTest.java b/java/tests/src/com/android/intentresolver/AbstractResolverComparatorTest.java
index 66e6f5b2..36058a6c 100644
--- a/java/tests/src/com/android/intentresolver/AbstractResolverComparatorTest.java
+++ b/java/tests/src/com/android/intentresolver/AbstractResolverComparatorTest.java
@@ -34,23 +34,6 @@ import java.util.List;
public class AbstractResolverComparatorTest {
@Test
- public void testPositionFixed() {
- ResolverActivity.ResolvedComponentInfo r1 = new ResolverActivity.ResolvedComponentInfo(
- new ComponentName("package", "class"), new Intent(), new ResolveInfo()
- );
- r1.setFixedAtTop(true);
-
- ResolverActivity.ResolvedComponentInfo r2 = new ResolverActivity.ResolvedComponentInfo(
- new ComponentName("zackage", "zlass"), new Intent(), new ResolveInfo()
- );
- r2.setPinned(true);
- Context context = InstrumentationRegistry.getTargetContext();
- AbstractResolverComparator comparator = getTestComparator(context);
- assertEquals("FixedAtTop ranks over pinned", -1, comparator.compare(r1, r2));
- assertEquals("Pinned ranks under fixedAtTop", 1, comparator.compare(r2, r1));
- }
-
- @Test
public void testPinned() {
ResolverActivity.ResolvedComponentInfo r1 = new ResolverActivity.ResolvedComponentInfo(
new ComponentName("package", "class"), new Intent(), new ResolveInfo()