diff options
| author | 2023-10-25 13:17:14 +0000 | |
|---|---|---|
| committer | 2023-10-25 13:17:14 +0000 | |
| commit | 13821e973e96d90a6fd606b858c834df42561d12 (patch) | |
| tree | 2b01c52cf32bd4ff7926253127e5d3a209d1791f | |
| parent | b3c5755283c472a70248fcf0db8a75a75c5926fe (diff) | |
| parent | 6633e9b7ae699f6923d2c6392bf5576114ec6d19 (diff) | |
Merge "Update docstring for iwlan supported new ike transforms" into main am: 6633e9b7ae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2795876
Change-Id: Icf3b978b65d6e6d490fa58f3873a81d0d71aad14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 749ed03b727f..43dab5338e93 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -8770,7 +8770,9 @@ public class CarrierConfigManager { * {@link android.net.ipsec.ike.SaProposal#DH_GROUP_NONE}, * {@link android.net.ipsec.ike.SaProposal#DH_GROUP_1024_BIT_MODP}, * {@link android.net.ipsec.ike.SaProposal#DH_GROUP_1536_BIT_MODP}, - * {@link android.net.ipsec.ike.SaProposal#DH_GROUP_2048_BIT_MODP} + * {@link android.net.ipsec.ike.SaProposal#DH_GROUP_2048_BIT_MODP}, + * {@link android.net.ipsec.ike.SaProposal#DH_GROUP_3072_BIT_MODP}, + * {@link android.net.ipsec.ike.SaProposal#DH_GROUP_4096_BIT_MODP} */ public static final String KEY_DIFFIE_HELLMAN_GROUPS_INT_ARRAY = KEY_PREFIX + "diffie_hellman_groups_int_array"; @@ -8838,7 +8840,8 @@ public class CarrierConfigManager { /** * List of supported encryption algorithms for child session. Possible values are - * {@link android.net.ipsec.ike.SaProposal#ENCRYPTION_ALGORITHM_AES_CBC} + * {@link android.net.ipsec.ike.SaProposal#ENCRYPTION_ALGORITHM_AES_CBC}, + * {@link android.net.ipsec.ike.SaProposal#ENCRYPTION_ALGORITHM_AES_CTR} */ public static final String KEY_SUPPORTED_CHILD_SESSION_ENCRYPTION_ALGORITHMS_INT_ARRAY = KEY_PREFIX + "supported_child_session_encryption_algorithms_int_array"; |