PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d am: 4770d017dc am: cd33a0fa88

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499

Change-Id: I24723fadb4e89560ddb96da8149dc6dfa4e6ce6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-04-13 10:25:09 +00:00
committed by Automerger Merge Worker
parent 4d737d7813 cd33a0fa88
commit e428b25ea0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/vpn2/ConfigDialog.java
View File

@@ -653,10 +653,14 @@ class ConfigDialog extends AlertDialog implements TextWatcher,
profile.ipsecSecret = mIpsecSecret.getText().toString();
break;
case VpnProfile.TYPE_IKEV2_IPSEC_RSA:
if (mIpsecUserCert.getSelectedItemPosition() != 0) {
profile.ipsecSecret = (String) mIpsecUserCert.getSelectedItem();
}
// fall through
case VpnProfile.TYPE_L2TP_IPSEC_RSA:
profile.l2tpSecret = mL2tpSecret.getText().toString();
// fall through
case VpnProfile.TYPE_IKEV2_IPSEC_RSA: // fall through
case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
if (mIpsecUserCert.getSelectedItemPosition() != 0) {
profile.ipsecUserCert = (String) mIpsecUserCert.getSelectedItem();