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

Change-Id: Ic267cbaa41cd22d76920ccdc4d0ad3596311de82
2020-03-09 14:26:45 +00:00
parent 1ec4c29546 c62583fb4f
commit 80a2d6d712
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();
    }