Merge "Avoid closing IKE during bring-up if Network is not updated" into udc-dev

2 files changed, 31 insertions, 0 deletions

diff --git a/src/com/google/android/iwlan/IwlanDataService.java b/src/com/google/android/iwlan/IwlanDataService.java
index 8759c6a..2f3ed2b 100644
--- a/src/com/google/android/iwlan/IwlanDataService.java
+++ b/src/com/google/android/iwlan/IwlanDataService.java
@@ -969,6 +969,9 @@ public class IwlanDataService extends DataService {
                 getTunnelManager().updateNetwork(network, linkProperties);
             }
 
+            if (network.equals(sNetwork)) {
+                return;
+            }
             for (Map.Entry<String, TunnelState> entry : mTunnelStateForApn.entrySet()) {
                 TunnelState tunnelState = entry.getValue();
                 if (tunnelState.getState() == TunnelState.TUNNEL_IN_BRINGUP) {
diff --git a/test/com/google/android/iwlan/IwlanDataServiceTest.java b/test/com/google/android/iwlan/IwlanDataServiceTest.java
index 4e53836..98fd3eb 100644
--- a/test/com/google/android/iwlan/IwlanDataServiceTest.java
+++ b/test/com/google/android/iwlan/IwlanDataServiceTest.java
@@ -408,6 +408,34 @@ public class IwlanDataServiceTest {
     }
 
     @Test
+    public void testOnLinkPropertiesChangedForBringingUpIkeSession() {
+        DataProfile dp = buildImsDataProfile();
+
+        NetworkCallback networkCallback = getNetworkMonitorCallback();
+        onSystemDefaultNetworkConnected(mMockNetwork, mLinkProperties, TRANSPORT_WIFI);
+
+        clearInvocations(mMockEpdgTunnelManager);
+
+        mSpyIwlanDataServiceProvider.setTunnelState(
+                dp,
+                mMockDataServiceCallback,
+                TunnelState.TUNNEL_IN_BRINGUP,
+                null, /* linkProperties */
+                false /* isHandover */,
+                1 /* pduSessionId */,
+                true /* isImsOrEmergency */);
+
+        LinkProperties newLinkProperties = new LinkProperties(mLinkProperties);
+        newLinkProperties.setInterfaceName("wlan0");
+        newLinkProperties.addLinkAddress(mMockIPv6LinkAddress);
+
+        networkCallback.onLinkPropertiesChanged(mMockNetwork, newLinkProperties);
+        verify(mMockEpdgTunnelManager, times(1))
+                .updateNetwork(eq(mMockNetwork), eq(newLinkProperties));
+        verify(mMockEpdgTunnelManager, never()).closeTunnel(any(), anyBoolean(), any(), any());
+    }
+
+    @Test
     public void testNetworkNotConnectedWithCellularAndCrossSimDisabled()
             throws InterruptedException {
         NetworkCapabilities nc =