commit 539821c9781aefc4aae0f9263bf9a23bf293d7e7
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 25 13:19:19 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 25 13:19:19 2019 +0000
tree 94f84e346ed04b72346cfbaa08c8e224e75541b9
parent 13cc9e442e4a9951f19377c831917e96888a9dbc
parent be381ab943eea158482d2df07a872846b9a0e2e4

Merge "Add nullability annotations"

core/java/android/net/StaticIpConfiguration.java

diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
index 0728d83..14dbca0 100644
--- a/core/java/android/net/StaticIpConfiguration.java
+++ b/core/java/android/net/StaticIpConfiguration.java
@@ -134,7 +134,7 @@
      * 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);