LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add missing nullability annotations." into stage-aosp-master

Browse Source
This commit is contained in:
Aurimas Liutikas
2019-08-30 15:19:45 +00:00
committed by Android (Google) Code Review
parent 904ee8f635 8fae993514
commit 9fe20bf048
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/StaticIpConfiguration.java
View File

@@ -236,6 +236,7 @@ public final class StaticIpConfiguration implements Parcelable {
return lp; return lp;
} }
@NonNull
@Override @Override
public String toString() { public String toString() {
StringBuffer str = new StringBuffer(); StringBuffer str = new StringBuffer();
@@ -267,7 +268,7 @@ public final class StaticIpConfiguration implements Parcelable {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (this == obj) return true; if (this == obj) return true;
if (!(obj instanceof StaticIpConfiguration)) return false; if (!(obj instanceof StaticIpConfiguration)) return false;

4
core/java/android/net/apf/ApfCapabilities.java
View File

@@ -17,6 +17,7 @@
package android.net.apf; package android.net.apf;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.content.res.Resources; import android.content.res.Resources;
@@ -91,6 +92,7 @@ public final class ApfCapabilities implements Parcelable {
} }
}; };
@NonNull
@Override @Override
public String toString() { public String toString() {
return String.format("%s{version: %d, maxSize: %d, format: %d}", getClass().getSimpleName(), return String.format("%s{version: %d, maxSize: %d, format: %d}", getClass().getSimpleName(),
@@ -98,7 +100,7 @@ public final class ApfCapabilities implements Parcelable {
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(@Nullable Object obj) {
if (!(obj instanceof ApfCapabilities)) return false; if (!(obj instanceof ApfCapabilities)) return false;
final ApfCapabilities other = (ApfCapabilities) obj; final ApfCapabilities other = (ApfCapabilities) obj;
return apfVersionSupported == other.apfVersionSupported return apfVersionSupported == other.apfVersionSupported