commit 1f69a5e261bcfbcba72ca851f088384a9846e6a9
author Roman Kalukiewicz <romkal@google.com> Wed Oct 14 15:59:06 2020 -0700
committer Remi NGUYEN VAN <reminv@google.com> Fri Feb 05 07:28:44 2021 +0000
tree 013a34b14433078122fe11bc267839ffe51dd4a3
parent 7fed6672053c86e254e0043d6218436af57b0409

Add @Nullable to Object#equals()

This is a partial cherry-pick of change:
I5eedb571c9d78862115dfdc5dae1cf2a35343580

for connectivity classes.

Bug: 170883422
Test: m
Merged-In: I5eedb571c9d78862115dfdc5dae1cf2a35343580
Change-Id: I7dc661863b73f4198ddb4f3a1566583d0f07db3c

framework/src/android/net/IpPrefix.java

diff --git a/framework/src/android/net/IpPrefix.java b/framework/src/android/net/IpPrefix.java
index e7c8014..bcb65fa 100644
--- a/framework/src/android/net/IpPrefix.java
+++ b/framework/src/android/net/IpPrefix.java
@@ -18,6 +18,7 @@
 
 import android.annotation.IntRange;
 import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -124,7 +125,7 @@
      * @return {@code true} if both objects are equal, {@code false} otherwise.
      */
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(@Nullable Object obj) {
         if (!(obj instanceof IpPrefix)) {
             return false;
         }