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

Merge "Add nullability annotations" am: 539821c978

Browse Source 
am: 97350573b9

Change-Id: Ic81850c2976e7412e85856c5d1336f30d0691125
This commit is contained in:
Remi NGUYEN VAN
2019-03-25 06:42:49 -07:00
committed by android-build-merger
parent 73062f4600 97350573b9
commit c66eb1e12e
1 changed files with 1 additions and 1 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 * 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. * 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); List<RouteInfo> routes = new ArrayList<RouteInfo>(3);
if (ipAddress != null) { if (ipAddress != null) {
RouteInfo connectedRoute = new RouteInfo(ipAddress, null, iface); RouteInfo connectedRoute = new RouteInfo(ipAddress, null, iface);