From 980693da91c06243c3163b6ebabdd3bd0ce1c410 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Fri, 6 Mar 2020 14:20:23 +0900 Subject: [PATCH] vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set Bug: 150910582 Test: Compiled bertha_x86_64-userdebug (Chrome OS ARCVM image) for rvc-dev, flashed eve-arcvm (Pixelbook), connected TouchVpn App, observed that ARC's VpnTracker does not crash the system server when printing VpnConfig objects with no ProxyInfo. Merged-In: I3f8dd1d232e2b18dae9e99eb05c92a797a2358b9 Change-Id: I3f8dd1d232e2b18dae9e99eb05c92a797a2358b9 (cherry picked from commit c8922177c82e0700b9857f03d5f698bbaebb0a4e) --- core/java/com/android/internal/net/VpnConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/com/android/internal/net/VpnConfig.java b/core/java/com/android/internal/net/VpnConfig.java index 6d2d7356a2e8e..7dc38711a6efa 100644 --- 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(); }