diff options
| author | Munikrishna J <jmunikrishna@google.com> | 2023-11-23 05:13:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-11-23 05:13:25 +0000 |
| commit | fb83cbb8d520952b24f762c268dfbb48a19d1dad (patch) | |
| tree | 5dde542140156fdbfed75f6470439c45f569546a /telephony | |
| parent | 59defc9e5bc294ae620bee5396dc18c0e913323a (diff) | |
| parent | c447f401b4e7c9b02e6b2b72699c3c271be94254 (diff) | |
| download | base-fb83cbb8d520952b24f762c268dfbb48a19d1dad.tar.gz | |
Merge "Adding multiple proposals of IKE SA and Child SA cipher suits in IWLAN" into main
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index c124079ca2e3..ede4885df097 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -8853,6 +8853,24 @@ public class CarrierConfigManager { KEY_PREFIX + "epdg_static_address_roaming_string"; /** + * Controls if the multiple SA proposals allowed for IKE session to include + * all the 3GPP TS 33.210 and RFC 8221 supported cipher suites in multiple + * IKE SA proposals as per RFC 7296. + */ + @FlaggedApi(Flags.FLAG_ENABLE_MULTIPLE_SA_PROPOSALS) + public static final String KEY_SUPPORTS_IKE_SESSION_MULTIPLE_SA_PROPOSALS_BOOL = + KEY_PREFIX + "supports_ike_session_multiple_sa_proposals_bool"; + + /** + * Controls if the multiple SA proposals allowed for Child session to include + * all the 3GPP TS 33.210 and RFC 8221 supported cipher suites in multiple + * Child SA proposals as per RFC 7296. + */ + @FlaggedApi(Flags.FLAG_ENABLE_MULTIPLE_SA_PROPOSALS) + public static final String KEY_SUPPORTS_CHILD_SESSION_MULTIPLE_SA_PROPOSALS_BOOL = + KEY_PREFIX + "supports_child_session_multiple_sa_proposals_bool"; + + /** * List of supported key sizes for AES Cipher Block Chaining (CBC) encryption mode of child * session. Possible values are: * {@link android.net.ipsec.ike.SaProposal#KEY_LEN_UNUSED}, @@ -9187,6 +9205,8 @@ public class CarrierConfigManager { defaults.putInt(KEY_IKE_REKEY_HARD_TIMER_SEC_INT, 14400); defaults.putInt(KEY_CHILD_SA_REKEY_SOFT_TIMER_SEC_INT, 3600); defaults.putInt(KEY_CHILD_SA_REKEY_HARD_TIMER_SEC_INT, 7200); + defaults.putBoolean(KEY_SUPPORTS_IKE_SESSION_MULTIPLE_SA_PROPOSALS_BOOL, false); + defaults.putBoolean(KEY_SUPPORTS_CHILD_SESSION_MULTIPLE_SA_PROPOSALS_BOOL, false); defaults.putIntArray( KEY_RETRANSMIT_TIMER_MSEC_INT_ARRAY, new int[] {500, 1000, 2000, 4000, 8000}); defaults.putInt(KEY_DPD_TIMER_SEC_INT, 120); |