Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d60d005b authored by Munikrishna J's avatar Munikrishna J Committed by Automerger Merge Worker
Browse files

Merge "Update docstring for iwlan supported new ike transforms" into main am:... 

Merge "Update docstring for iwlan supported new ike transforms" into main am: 6633e9b7 am: 2125c830

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



Change-Id: I77677722150fa2ab301f084f02337ad200227a09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3dcc224c 2125c830

telephony/java/android/telephony/CarrierConfigManager.java

+5 −2
Original line number Diff line number Diff line
@@ -8794,7 +8794,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";
@@ -8862,7 +8864,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";