Add @Nullable annotation to the parameter of Object.equals() methods.

Those annotations could be inferred by some tools (like Kotlin), but the
https://checkerframework.org/ doesn't check inherited annotations
complaining about all equals() invocations that get nullable argument.

The change was generated by running

find . -name \*.java | xargs sed -i 's/public boolean equals(Object /public boolean equals(@Nullable Object /'

in the frameworks/base directory and by automatically adding and
formatting required imports if needed. No manual edits.

Bug: 170883422
Test: Annotation change only. Should have not impact.
Exempt-From-Owner-Approval: Mechanical change not specific to any component.
Change-Id: I5eedb571c9d78862115dfdc5dae1cf2a35343580
This commit is contained in:
Roman Kalukiewicz
2020-10-14 15:59:06 -07:00
parent 4c1d8a48fc
commit 76a6131fdb
5 changed files with 8 additions and 5 deletions

View File

@@ -16,6 +16,7 @@
package android.net; package android.net;
import android.annotation.Nullable;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -95,7 +96,7 @@ public final class DataUsageRequest implements Parcelable {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (obj instanceof DataUsageRequest == false) return false; if (obj instanceof DataUsageRequest == false) return false;
DataUsageRequest that = (DataUsageRequest) obj; DataUsageRequest that = (DataUsageRequest) obj;
return that.requestId == this.requestId return that.requestId == this.requestId

View File

@@ -21,6 +21,7 @@ import static com.android.internal.util.Preconditions.checkNotNull;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresFeature; import android.annotation.RequiresFeature;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
import android.annotation.SystemApi; import android.annotation.SystemApi;
@@ -153,7 +154,7 @@ public final class IpSecTransform implements AutoCloseable {
/** /**
* Standard equals. * Standard equals.
*/ */
public boolean equals(Object other) { public boolean equals(@Nullable Object other) {
if (this == other) return true; if (this == other) return true;
if (!(other instanceof IpSecTransform)) return false; if (!(other instanceof IpSecTransform)) return false;
final IpSecTransform rhs = (IpSecTransform) other; final IpSecTransform rhs = (IpSecTransform) other;

View File

@@ -20,6 +20,7 @@ import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.getNetworkTypeName; import static android.net.ConnectivityManager.getNetworkTypeName;
import static android.net.ConnectivityManager.isNetworkTypeMobile; import static android.net.ConnectivityManager.isNetworkTypeMobile;
import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
@@ -69,7 +70,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (obj instanceof NetworkIdentity) { if (obj instanceof NetworkIdentity) {
final NetworkIdentity ident = (NetworkIdentity) obj; final NetworkIdentity ident = (NetworkIdentity) obj;
return mType == ident.mType && mSubType == ident.mSubType && mRoaming == ident.mRoaming return mType == ident.mType && mSubType == ident.mSubType && mRoaming == ident.mRoaming

View File

@@ -411,7 +411,7 @@ public final class NetworkStats implements Parcelable {
/** @hide */ /** @hide */
@Override @Override
public boolean equals(Object o) { public boolean equals(@Nullable Object o) {
if (o instanceof Entry) { if (o instanceof Entry) {
final Entry e = (Entry) o; final Entry e = (Entry) o;
return uid == e.uid && set == e.set && tag == e.tag && metered == e.metered return uid == e.uid && set == e.set && tag == e.tag && metered == e.metered

View File

@@ -327,7 +327,7 @@ public class NetworkTemplate implements Parcelable {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (obj instanceof NetworkTemplate) { if (obj instanceof NetworkTemplate) {
final NetworkTemplate other = (NetworkTemplate) obj; final NetworkTemplate other = (NetworkTemplate) obj;
return mMatchRule == other.mMatchRule return mMatchRule == other.mMatchRule