diff options
author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2024-01-03 17:59:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-03 17:59:28 +0000 |
commit | 422eb80feae2e73eda9678ecaacbd087d4b7020b (patch) | |
tree | cbc7e4894708533a0ddc4e61da1d74e64393e0e1 /android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java | |
parent | eec82bd5ace8fd2c4ba647f153c4c03e1bb41268 (diff) | |
parent | 0be00b5218b69852777cab76ff89457211904bc9 (diff) | |
download | guava-422eb80feae2e73eda9678ecaacbd087d4b7020b.tar.gz |
Merge "Upgrade guava to v33.0.0" into main am: fcb6827395 am: 0be00b5218
Original change: https://android-review.googlesource.com/c/platform/external/guava/+/2894060
Change-Id: I8deb731e9d2b4cc35b6760f190c9e7583e91b271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java')
-rw-r--r-- | android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java b/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java index ef0fbb378..d31572cf7 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableSortedSet.java @@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; +import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; import java.util.Collection; import java.util.Collections; @@ -319,4 +320,13 @@ final class RegularImmutableSortedSet<E> extends ImmutableSortedSet<E> { ? emptySet(reversedOrder) : new RegularImmutableSortedSet<E>(elements.reverse(), reversedOrder); } + + // redeclare to help optimizers with b/310253115 + @SuppressWarnings("RedundantOverride") + @Override + @J2ktIncompatible // serialization + @GwtIncompatible // serialization + Object writeReplace() { + return super.writeReplace(); + } } |