diff options
| author | Xin Li <delphij@google.com> | 2021-10-07 23:50:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-07 23:50:15 +0000 |
| commit | c03b0fa033117c03430e361d561aa910e95a0478 (patch) | |
| tree | 9c6aaee5a3023a6c237394b44e06a3fdb46f6747 /core/java/android/util/Range.java | |
| parent | 8cc0f40cf250d9c66dc15d0e8bc3a41db9a7cfa1 (diff) | |
| parent | 531b8f4f2605c44cf73e8421f674a1c7a9c277ff (diff) | |
Merge "Merge Android 12"
Diffstat (limited to 'core/java/android/util/Range.java')
| -rw-r--r-- | core/java/android/util/Range.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/util/Range.java b/core/java/android/util/Range.java index f31ddd9b0307..9fd0ab99f01b 100644 --- a/core/java/android/util/Range.java +++ b/core/java/android/util/Range.java @@ -18,6 +18,7 @@ package android.util; import static com.android.internal.util.Preconditions.*; +import android.annotation.Nullable; import android.hardware.camera2.utils.HashCodeHelpers; /** @@ -146,7 +147,7 @@ public final class Range<T extends Comparable<? super T>> { * @return {@code true} if the ranges are equal, {@code false} otherwise */ @Override - public boolean equals(Object obj) { + public boolean equals(@Nullable Object obj) { if (obj == null) { return false; } else if (this == obj) { |