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

Commit b55451dd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "vpn: Fix NPE in VpnConfig#toString when no ProxyInfo is set" into rvc-dev am: 4cf68151 am: da7b5b0b am: 4b6b9707 am: 0230c6e2

Change-Id: I10de38c137ba8c5d23c10d3e6adbdd0c25add610
parents 579e0141 0230c6e2

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

+1 −1
Original line number Diff line number Diff line
@@ -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();

    }