From c2bbd73e23eb5da6b40753eca5c0efbab19cc727 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 10 Jun 2024 13:26:46 -0700 Subject: [PATCH] Remove workaround for [ancient Android `unmodifiableMap` bug](https://issuetracker.google.com/36997692). [The fix](https://android-review.googlesource.com/c/platform/libcore/+/98929) is [present](https://cs.android.com/android/platform/superproject/+/android-5.0.2_r3:libcore/luni/src/main/java/java/util/Collections.java;l=1215;drc=244e90adfe67264364de88df0fd741db0eb12b7f) in time for [Lollipop](https://source.android.com/docs/setup/reference/build-numbers), the oldest version [we currently test under](https://github.com/google/guava?tab=readme-ov-file#important-warnings). RELNOTES=n/a PiperOrigin-RevId: 642003868 --- .../collect/testing/google/UnmodifiableCollectionTests.java | 5 +---- .../collect/testing/google/UnmodifiableCollectionTests.java | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java b/android/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java index a4d552429376..282ef6f87db0 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java @@ -22,7 +22,6 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Iterators; import com.google.common.collect.LinkedHashMultiset; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -120,9 +119,7 @@ public static void assertIteratorsInOrder( siblingCollection.add(sampleElement); Collection copy = new ArrayList<>(); - // Avoid copy.addAll(collection), which runs afoul of an Android bug in older versions: - // http://b.android.com/72073 http://r.android.com/98929 - Iterators.addAll(copy, collection.iterator()); + copy.addAll(collection); try { collection.add(sampleElement); diff --git a/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java b/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java index f7402038008f..138414949c0c 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/UnmodifiableCollectionTests.java @@ -22,7 +22,6 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Iterators; import com.google.common.collect.LinkedHashMultiset; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -120,9 +119,7 @@ public static void assertIteratorsInOrder( siblingCollection.add(sampleElement); Collection copy = new ArrayList<>(); - // Avoid copy.addAll(collection), which runs afoul of an Android bug in older versions: - // http://b.android.com/72073 http://r.android.com/98929 - Iterators.addAll(copy, collection.iterator()); + copy.addAll(collection); try { collection.add(sampleElement);