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

2020-03-06 12:30:17 +00:00
parent 9c5f79ef29 c8922177c8
commit 4cf6815168
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();
    }