diff --git a/android/guava/src/com/google/common/collect/ImmutableRangeMap.java b/android/guava/src/com/google/common/collect/ImmutableRangeMap.java index 8a477961989d..aa7d91ce0065 100644 --- a/android/guava/src/com/google/common/collect/ImmutableRangeMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableRangeMap.java @@ -241,7 +241,7 @@ public final void putCoalescing(Range range, V value) { @Deprecated @Override @DoNotCall("Always throws UnsupportedOperationException") - public final void putAll(RangeMap rangeMap) { + public final void putAll(RangeMap rangeMap) { throw new UnsupportedOperationException(); } diff --git a/android/guava/src/com/google/common/collect/RangeMap.java b/android/guava/src/com/google/common/collect/RangeMap.java index 14adb00c18c0..112403e52ef6 100644 --- a/android/guava/src/com/google/common/collect/RangeMap.java +++ b/android/guava/src/com/google/common/collect/RangeMap.java @@ -101,7 +101,7 @@ public interface RangeMap { void putCoalescing(Range range, V value); /** Puts all the associations from {@code rangeMap} into this range map (optional operation). */ - void putAll(RangeMap rangeMap); + void putAll(RangeMap rangeMap); /** Removes all associations from this range map (optional operation). */ void clear(); diff --git a/android/guava/src/com/google/common/collect/TreeRangeMap.java b/android/guava/src/com/google/common/collect/TreeRangeMap.java index 0ce8e89551cf..4259bb989832 100644 --- a/android/guava/src/com/google/common/collect/TreeRangeMap.java +++ b/android/guava/src/com/google/common/collect/TreeRangeMap.java @@ -167,8 +167,8 @@ private static Range coalesce( } @Override - public void putAll(RangeMap rangeMap) { - for (Entry, V> entry : rangeMap.asMapOfRanges().entrySet()) { + public void putAll(RangeMap rangeMap) { + for (Entry, ? extends V> entry : rangeMap.asMapOfRanges().entrySet()) { put(entry.getKey(), entry.getValue()); } } @@ -341,7 +341,7 @@ public void putCoalescing(Range> range, Object value) { } @Override - public void putAll(RangeMap, Object> rangeMap) { + public void putAll(RangeMap, ? extends Object> rangeMap) { if (!rangeMap.asMapOfRanges().isEmpty()) { throw new IllegalArgumentException( "Cannot putAll(nonEmptyRangeMap) into an empty subRangeMap"); @@ -447,7 +447,7 @@ public void putCoalescing(Range range, V value) { } @Override - public void putAll(RangeMap rangeMap) { + public void putAll(RangeMap rangeMap) { if (rangeMap.asMapOfRanges().isEmpty()) { return; } diff --git a/guava/src/com/google/common/collect/ImmutableRangeMap.java b/guava/src/com/google/common/collect/ImmutableRangeMap.java index e1979ab65fe9..999a3014081e 100644 --- a/guava/src/com/google/common/collect/ImmutableRangeMap.java +++ b/guava/src/com/google/common/collect/ImmutableRangeMap.java @@ -258,7 +258,7 @@ public final void putCoalescing(Range range, V value) { @Deprecated @Override @DoNotCall("Always throws UnsupportedOperationException") - public final void putAll(RangeMap rangeMap) { + public final void putAll(RangeMap rangeMap) { throw new UnsupportedOperationException(); } diff --git a/guava/src/com/google/common/collect/RangeMap.java b/guava/src/com/google/common/collect/RangeMap.java index 99e7b97d5ee9..7dd353986576 100644 --- a/guava/src/com/google/common/collect/RangeMap.java +++ b/guava/src/com/google/common/collect/RangeMap.java @@ -103,7 +103,7 @@ public interface RangeMap { void putCoalescing(Range range, V value); /** Puts all the associations from {@code rangeMap} into this range map (optional operation). */ - void putAll(RangeMap rangeMap); + void putAll(RangeMap rangeMap); /** Removes all associations from this range map (optional operation). */ void clear(); diff --git a/guava/src/com/google/common/collect/TreeRangeMap.java b/guava/src/com/google/common/collect/TreeRangeMap.java index 60e7bf3df874..a47ec2837175 100644 --- a/guava/src/com/google/common/collect/TreeRangeMap.java +++ b/guava/src/com/google/common/collect/TreeRangeMap.java @@ -169,8 +169,8 @@ private static Range coalesce( } @Override - public void putAll(RangeMap rangeMap) { - for (Entry, V> entry : rangeMap.asMapOfRanges().entrySet()) { + public void putAll(RangeMap rangeMap) { + for (Entry, ? extends V> entry : rangeMap.asMapOfRanges().entrySet()) { put(entry.getKey(), entry.getValue()); } } @@ -417,7 +417,7 @@ public void putCoalescing(Range> range, Object value) { } @Override - public void putAll(RangeMap, Object> rangeMap) { + public void putAll(RangeMap, ? extends Object> rangeMap) { if (!rangeMap.asMapOfRanges().isEmpty()) { throw new IllegalArgumentException( "Cannot putAll(nonEmptyRangeMap) into an empty subRangeMap"); @@ -534,7 +534,7 @@ public void putCoalescing(Range range, V value) { } @Override - public void putAll(RangeMap rangeMap) { + public void putAll(RangeMap rangeMap) { if (rangeMap.asMapOfRanges().isEmpty()) { return; }