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

Commit fea2f221 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" am: a03fa63d am: a50c41b0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200896



Change-Id: I600dc5f51430b2702cbb13af066e458e190561fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24c74234 a50c41b0

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