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

Change-Id: Ic23d24ea6f2d62fb1131ba22d3f0892fdf39e90f
2020-03-09 14:15:29 +00:00
parent ed2da4f78f ea11eb2a5d
commit c62583fb4f
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/net/VpnConfig.java
+++ b/core/java/com/android/internal/net/VpnConfig.java
@@ -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();
    }