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

Commit a03fa63d authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile"

parents a3d59293 29348dbf

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));