commit 4c5334809df0f905c374add8f4534252b84b3d7c
author Chiachang Wang <chiachangwang@google.com> Thu Apr 13 08:53:57 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 13 08:53:57 2023 +0000
tree 7307709b80507a5fbee47a5ee1835ec07c57ac95
parent fd8670a4c19458ea68c25f23fbc3954126d03164
parent 02156d600db553b07d5152621d02624352bf3501

Merge "Populate ipsecSecret field in VpnProfile"

src/com/android/settings/vpn2/ConfigDialog.java

diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java
index be2a68e..036487d 100644
--- a/src/com/android/settings/vpn2/ConfigDialog.java
+++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -653,10 +653,14 @@
                 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();