Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add nullability annotations"

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-25 13:19:19 +00:00
committed by Gerrit Code Review
parent 6aef2afd4e 45ecef3b4c
commit a1ee1fc888
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,7 @@ public final class StaticIpConfiguration implements Parcelable {
* route to the gateway as well. This configuration is arguably invalid, but it used to work
* in K and earlier, and other OSes appear to accept it.
*/
public @NonNull List<RouteInfo> getRoutes(String iface) {
public @NonNull List<RouteInfo> getRoutes(@Nullable String iface) {
List<RouteInfo> routes = new ArrayList<RouteInfo>(3);
if (ipAddress != null) {
RouteInfo connectedRoute = new RouteInfo(ipAddress, null, iface);

7
core/java/android/net/metrics/ValidationProbeEvent.java
View File

@@ -153,11 +153,14 @@ public final class ValidationProbeEvent implements IpConnectivityLog.Event {
return (probeType & 0xff) | (firstValidation ? FIRST_VALIDATION : REVALIDATION);
}
public static String getProbeName(int probeType) {
/**
* Get the name of a probe specified by its probe type.
*/
public static @NonNull String getProbeName(int probeType) {
return Decoder.constants.get(probeType & 0xff, "PROBE_???");
}
private static String getValidationStage(int probeType) {
private static @NonNull String getValidationStage(int probeType) {
return Decoder.constants.get(probeType & 0xff00, "UNKNOWN");
}