Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set"
This commit is contained in:
@@ -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();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user