diff --git a/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java b/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java index 78b4f0275d5a..5363e844da2e 100644 --- a/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java @@ -32,7 +32,6 @@ import java.io.Serializable; import java.util.AbstractCollection; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.ConcurrentModificationException; import java.util.Iterator; @@ -265,10 +264,8 @@ public Collection removeAll(@Nullable Object key) { return unmodifiableCollectionSubclass(output); } - Collection unmodifiableCollectionSubclass( - Collection collection) { - return Collections.unmodifiableCollection(collection); - } + abstract Collection unmodifiableCollectionSubclass( + Collection collection); @Override public void clear() { @@ -300,9 +297,7 @@ public Collection get(@ParametricNullness K key) { * Generates a decorated collection that remains consistent with the values in the multimap for * the provided key. Changes to the multimap may alter the returned collection, and vice versa. */ - Collection wrapCollection(@ParametricNullness K key, Collection collection) { - return new WrappedCollection(key, collection, null); - } + abstract Collection wrapCollection(@ParametricNullness K key, Collection collection); final List wrapList( @ParametricNullness K key, List list, @Nullable WrappedCollection ancestor) { diff --git a/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java b/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java index ca9969397c80..b320950c9ab2 100644 --- a/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java +++ b/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java @@ -32,7 +32,6 @@ import java.io.Serializable; import java.util.AbstractCollection; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.ConcurrentModificationException; import java.util.Iterator; @@ -267,10 +266,8 @@ public Collection removeAll(@Nullable Object key) { return unmodifiableCollectionSubclass(output); } - Collection unmodifiableCollectionSubclass( - Collection collection) { - return Collections.unmodifiableCollection(collection); - } + abstract Collection unmodifiableCollectionSubclass( + Collection collection); @Override public void clear() { @@ -302,9 +299,7 @@ public Collection get(@ParametricNullness K key) { * Generates a decorated collection that remains consistent with the values in the multimap for * the provided key. Changes to the multimap may alter the returned collection, and vice versa. */ - Collection wrapCollection(@ParametricNullness K key, Collection collection) { - return new WrappedCollection(key, collection, null); - } + abstract Collection wrapCollection(@ParametricNullness K key, Collection collection); final List wrapList( @ParametricNullness K key, List list, @Nullable WrappedCollection ancestor) {