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

Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile"

Browse Source
This commit is contained in:
Chiachang Wang
2022-09-02 12:15:09 +00:00
committed by Gerrit Code Review
parent a3d5929306 29348dbfca
commit a03fa63d19
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));