commit e289064a7bd340da94669d0244833bb52b1e298f
author Remi NGUYEN VAN <reminv@google.com> Mon Mar 25 06:56:43 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Mar 25 06:56:43 2019 -0700
tree 3b477e6d5de0d8b8cc5c3a4b3d1f391c569fc9fd
parent f2a195cad02fe52de3b8556bbdf63baf621dbee2
parent c66eb1e12e0bfed333e46e6519435ed1130657be

Merge "Add nullability annotations" am: 539821c978 am: 97350573b9
am: c66eb1e12e

Change-Id: I43088399da1d81556ab903ef1ca716439129f00d

core/java/android/net/StaticIpConfiguration.java

diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
index e253105..565f36f 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);