Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" into...

Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" into rvc-dev am: 4cf68151 am: da7b5b0b am: 075cede6

Change-Id: I29770d5b1b2b7510dca5c4b5b9e52faa626c3a8a

parents 7b58ba48 075cede6

core/java/com/android/internal/net/VpnConfig.java

+1 −1

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