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

Commit 27c36806 authored by Chiachang Wang's avatar Chiachang Wang Committed by Android (Google) Code Review
Browse files

Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" into tm-qpr-dev

parents d0208d92 9a80121f

core/java/android/net/Ikev2VpnProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile { 
        mPassword = password;

        mRsaPrivateKey = rsaPrivateKey;

        mUserCert = userCert;

        mProxyInfo = new ProxyInfo(proxyInfo);

        mProxyInfo = (proxyInfo == null) ? null : new ProxyInfo(proxyInfo);



        // UnmodifiableList doesn't make a defensive copy by default.

        mAllowedAlgorithms = Collections.unmodifiableList(new ArrayList<>(allowedAlgorithms));