Fixing itemInfoMatcher not working for folders
Bug: 197686628
Test: Manual
Change-Id: Ie43a55be6cce4bc73e38525388d744a649dbc740
diff --git a/src/com/android/launcher3/util/ItemInfoMatcher.java b/src/com/android/launcher3/util/ItemInfoMatcher.java
index e8ba28f..ab3083d 100644
--- a/src/com/android/launcher3/util/ItemInfoMatcher.java
+++ b/src/com/android/launcher3/util/ItemInfoMatcher.java
@@ -32,6 +32,11 @@
*/
public interface ItemInfoMatcher {
+ /**
+ * Empty component used for match testing
+ */
+ ComponentName EMPTY_COMPONENT = new ComponentName("", "");
+
boolean matches(ItemInfo info, ComponentName cn);
/**
@@ -40,7 +45,7 @@
default boolean matchesInfo(ItemInfo info) {
if (info != null) {
ComponentName cn = info.getTargetComponent();
- return cn != null && matches(info, cn);
+ return matches(info, cn != null ? cn : EMPTY_COMPONENT);
} else {
return false;
}