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

Merge "Fix NPE in toString" am: 329e04abc8

Browse Source 
Original change: undetermined

Change-Id: Ic39746cf86e94e65b9fe0d5fc6189e41348d45a7
This commit is contained in:
Robert Greenwalt
2021-05-31 03:48:28 +00:00
committed by Automerger Merge Worker
parent 1a5551d91d 329e04abc8
commit d5d94cb077
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
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(mProxy.getHostAddress()).append(":").append(mPort)
.append(" xl=").append(mExclusionList);
if (mProxy != null) {
sb.append(mProxy.getHostAddress()).append(":").append(mPort);
if (mExclusionList != null) {
sb.append(" xl=").append(mExclusionList);
}
}
return sb.toString();
}