summaryrefslogtreecommitdiff
path: root/core/java/android/util/MapCollections.java
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-07 23:50:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-10-07 23:50:15 +0000
commitc03b0fa033117c03430e361d561aa910e95a0478 (patch)
tree9c6aaee5a3023a6c237394b44e06a3fdb46f6747 /core/java/android/util/MapCollections.java
parent8cc0f40cf250d9c66dc15d0e8bc3a41db9a7cfa1 (diff)
parent531b8f4f2605c44cf73e8421f674a1c7a9c277ff (diff)
Merge "Merge Android 12"
Diffstat (limited to 'core/java/android/util/MapCollections.java')
-rw-r--r--core/java/android/util/MapCollections.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/util/MapCollections.java b/core/java/android/util/MapCollections.java
index a5212688c6c6..7ab3fcaeedc4 100644
--- a/core/java/android/util/MapCollections.java
+++ b/core/java/android/util/MapCollections.java
@@ -16,6 +16,8 @@
package android.util;
+import android.annotation.Nullable;
+
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Iterator;
@@ -249,7 +251,7 @@ abstract class MapCollections<K, V> {
}
@Override
- public boolean equals(Object object) {
+ public boolean equals(@Nullable Object object) {
return equalsSetHelper(this, object);
}
@@ -339,7 +341,7 @@ abstract class MapCollections<K, V> {
}
@Override
- public boolean equals(Object object) {
+ public boolean equals(@Nullable Object object) {
return equalsSetHelper(this, object);
}