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

Merge "Fix NPE in toString"

Browse Source
This commit is contained in:
Robert Greenwalt
2010-09-01 16:18:01 -07:00
committed by Android (Google) Code Review
parent 94daa185b8 e422ad9819
commit 329e04abc8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/ProxyProperties.java
View File

@@ -75,8 +75,12 @@ public class ProxyProperties implements Parcelable {
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(mProxy.getHostAddress()).append(":").append(mPort) if (mProxy != null) {
.append(" xl=").append(mExclusionList); sb.append(mProxy.getHostAddress()).append(":").append(mPort);
if (mExclusionList != null) {
sb.append(" xl=").append(mExclusionList);
}
}
return sb.toString(); return sb.toString();
} }