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

Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev

Browse Source 
am: bd4b5327db

* commit 'bd4b5327dbbe42ad997080d18c8c767c002ffde6':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: Ic99edb732d532da27c042824e5ca07c4b35ccfa1
This commit is contained in:
Erik Kline
2016-05-19 04:21:17 +00:00
committed by android-build-merger
parent 39db67ab88 bd4b5327db
commit ef4e70afc3
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

@@ -131,7 +131,7 @@ public class StaticIpConfiguration implements Parcelable {
str.append(" ").append(dnsServer.getHostAddress()); str.append(" ").append(dnsServer.getHostAddress());
} }
str.append(" ] Domains"); str.append(" ] Domains ");
if (domains != null) str.append(domains); if (domains != null) str.append(domains);
return str.toString(); return str.toString();
} }