Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" am: a03fa63d19 am: a50c41b050

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

Change-Id: I600dc5f51430b2702cbb13af066e458e190561fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2022-09-02 13:10:42 +00:00
committed by Automerger Merge Worker
parent 24c7423452 a50c41b050
commit fea2f221ed
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/Ikev2VpnProfile.java
View File

@@ -171,7 +171,7 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
mPassword = password; mPassword = password;
mRsaPrivateKey = rsaPrivateKey; mRsaPrivateKey = rsaPrivateKey;
mUserCert = userCert; mUserCert = userCert;
mProxyInfo = new ProxyInfo(proxyInfo); mProxyInfo = (proxyInfo == null) ? null : new ProxyInfo(proxyInfo);
// UnmodifiableList doesn't make a defensive copy by default. // UnmodifiableList doesn't make a defensive copy by default.
mAllowedAlgorithms = Collections.unmodifiableList(new ArrayList<>(allowedAlgorithms)); mAllowedAlgorithms = Collections.unmodifiableList(new ArrayList<>(allowedAlgorithms));