Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 273033ea authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add nullability annotations" am: a1ee1fc8 am: 3d48153a am: b141a800"

parents 01f9b471 525878a4

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -4216,7 +4216,7 @@ package android.net { 
    method @Nullable public String getDomains();

    method @Nullable public java.net.InetAddress getGateway();

    method @Nullable public android.net.LinkAddress getIpAddress();

    method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(String);

    method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(@Nullable String);

    method public void setDomains(@Nullable String);

    method public void setGateway(@Nullable java.net.InetAddress);

    method public void setIpAddress(@Nullable android.net.LinkAddress);
@@ -4436,7 +4436,7 @@ package android.net.metrics { 
  }















  public final class ValidationProbeEvent implements android.net.metrics.IpConnectivityLog.Event {













    method public static String getProbeName(int);













    method @NonNull public static String getProbeName(int);















    field public static final int DNS_FAILURE = 0; // 0x0















    field public static final int DNS_SUCCESS = 1; // 0x1















    field public static final int PROBE_DNS = 0; // 0x0

































api/test-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -1316,7 +1316,7 @@ package android.net {













    method @Nullable public String getDomains();















    method @Nullable public java.net.InetAddress getGateway();















    method @Nullable public android.net.LinkAddress getIpAddress();













    method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(String);













    method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(@Nullable String);















    method public void setDomains(@Nullable String);















    method public void setGateway(@Nullable java.net.InetAddress);















    method public void setIpAddress(@Nullable android.net.LinkAddress);










@@ -1535,7 +1535,7 @@ package android.net.metrics {













  }































  public final class ValidationProbeEvent implements android.net.metrics.IpConnectivityLog.Event {













    method public static String getProbeName(int);













    method @NonNull public static String getProbeName(int);















    field public static final int DNS_FAILURE = 0; // 0x0















    field public static final int DNS_SUCCESS = 1; // 0x1















    field public static final int PROBE_DNS = 0; // 0x0

































core/java/android/net/StaticIpConfiguration.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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);

































core/java/android/net/metrics/ValidationProbeEvent.java



+5
−2




























Original line number
Diff line number
Diff line








@@ -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");















    }