Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 980693da authored by Hugo Benichi's avatar Hugo Benichi
Browse files

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 c8922177)
parent a9034824

core/java/com/android/internal/net/VpnConfig.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -232,7 +232,7 @@ public class VpnConfig implements Parcelable { 
                .append(", allowIPv4=").append(allowIPv4)

                .append(", allowIPv4=").append(allowIPv4)

                .append(", allowIPv6=").append(allowIPv6)

                .append(", allowIPv6=").append(allowIPv6)

                .append(", underlyingNetworks=").append(Arrays.toString(underlyingNetworks))

                .append(", underlyingNetworks=").append(Arrays.toString(underlyingNetworks))

                .append(", proxyInfo=").append(proxyInfo.toString())

                .append(", proxyInfo=").append(proxyInfo)

                .append("}")

                .append("}")

                .toString();

                .toString();

    }

    }