Apply the change to `android/guava/src/com/google/common/collect/Maps…

….java` as well
PicnicSupermarket · Jul 17, 2023 · 6c47dd6 · 6c47dd6
1 parent 51ec4e9
commit 6c47dd6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/android/guava/src/com/google/common/collect/Maps.java b/android/guava/src/com/google/common/collect/Maps.java
@@ -35,6 +35,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
+import com.google.common.collect.Collections2.FilteredCollection;
 import com.google.common.collect.MapDifference.ValueDifference;
 import com.google.common.primitives.Ints;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -1247,7 +1248,8 @@ public static <K, V> ImmutableMap<K, V> toMap(
   @CanIgnoreReturnValue
   public static <K, V> ImmutableMap<K, V> uniqueIndex(
       Iterable<V> values, Function<? super V, K> keyFunction) {
-    if (values instanceof Collection) {
+    if (values instanceof Collection
+        && !(values instanceof FilteredCollection || values instanceof FilteredMultimapValues)) {
       return uniqueIndex(
           values.iterator(),
           keyFunction,