Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" am: ea11eb2a5d

Browse Source 
Change-Id: Ic23d24ea6f2d62fb1131ba22d3f0892fdf39e90f
This commit is contained in:
Automerger Merge Worker
2020-03-09 14:15:29 +00:00
parent ed2da4f78f ea11eb2a5d
commit c62583fb4f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/net/VpnConfig.java
View File

@@ -232,7 +232,7 @@ public class VpnConfig implements Parcelable {
.append(", allowIPv4=").append(allowIPv4) .append(", allowIPv4=").append(allowIPv4)
.append(", allowIPv6=").append(allowIPv6) .append(", allowIPv6=").append(allowIPv6)
.append(", underlyingNetworks=").append(Arrays.toString(underlyingNetworks)) .append(", underlyingNetworks=").append(Arrays.toString(underlyingNetworks))
.append(", proxyInfo=").append(proxyInfo.toString()) .append(", proxyInfo=").append(proxyInfo)
.append("}") .append("}")
.toString(); .toString();
} }