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

Change-Id: Ibfbed881ae08f69f15ee3d2fa3c251b4ef5fb68a
2020-03-06 13:03:58 +00:00
parent 95f27a28fb da7b5b0b09
commit 4b6b970787
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();
    }