joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add nullability annotations"

Browse source 
am: 539821c978

Change-Id: I47ec92d406b16eaff049ad4a5af1b1b407418e4d
This commit is contained in:
Remi NGUYEN VAN 2019-03-25 06:33:40 -07:00 • committed by android-build-merger
commit 97350573b9
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
* 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);