commit 8f70eb8133f2695e319e8c447cad6b8077f10e12
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 09 21:06:10 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 09 21:06:10 2021 +0000
tree f440288b38c3372a4f46f48a4b0a99a724571869
parent b14b0ef39c1bd7242becef1d835a624d50b34459
parent 40bfae74efe53f5f39c145106fb5f89513ed0003

Merge "EpdgTunnelMgr: INITIAL_CONTACT in IkeSessionParams"

src/com/google/android/iwlan/epdg/EpdgTunnelManager.java

diff --git a/src/com/google/android/iwlan/epdg/EpdgTunnelManager.java b/src/com/google/android/iwlan/epdg/EpdgTunnelManager.java
index 220fc7d..30df6b3 100644
--- a/src/com/google/android/iwlan/epdg/EpdgTunnelManager.java
+++ b/src/com/google/android/iwlan/epdg/EpdgTunnelManager.java
@@ -872,6 +872,10 @@
                 InetAddresses.parseNumericAddress(TRAFFIC_SELECTOR_IPV6_END_ADDR));
     }
 
+    private int numPdnTunnels() {
+        return mApnNameToTunnelConfig.size();
+    }
+
     private IkeSessionParams buildIkeSessionParams(
             TunnelSetupRequest setupRequest, String apnName) {
         int hardTimeSeconds =
@@ -921,6 +925,11 @@
                         .setRetransmissionTimeoutsMillis(getRetransmissionTimeoutsFromConfig())
                         .setDpdDelaySeconds(getDpdDelayFromConfig());
 
+        if (numPdnTunnels() == 0) {
+            builder.addIkeOption(IkeSessionParams.IKE_OPTION_INITIAL_CONTACT);
+            Log.d(TAG, "IKE_OPTION_INITIAL_CONTACT");
+        }
+
         if ((int) getConfig(CarrierConfigManager.Iwlan.KEY_EPDG_AUTHENTICATION_METHOD_INT)
                 == CarrierConfigManager.Iwlan.AUTHENTICATION_METHOD_EAP_ONLY) {
             builder.addIkeOption(IkeSessionParams.IKE_OPTION_EAP_ONLY_AUTH);