diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-11 23:20:29 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-11 23:20:29 +0000 |
| commit | 3b2f08e502584e1d7cd96cb40c931bb3aa72cada (patch) | |
| tree | 0f73b6b248633cfb0a122b8f5473135fc5a068b3 | |
| parent | ee9ff9cb9f9f9451a7a8900f7f0403bda727873a (diff) | |
| parent | 22e14b73f74af7bfa002ec84346e00ac132eea34 (diff) | |
| download | Iwlan-3b2f08e502584e1d7cd96cb40c931bb3aa72cada.tar.gz | |
Snap for 10477539 from 22e14b73f74af7bfa002ec84346e00ac132eea34 to udc-qpr1-release
Change-Id: I1ee56635bb62313949f83f7aea83e4e48e011206
| -rw-r--r-- | src/com/google/android/iwlan/IwlanDataService.java | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/com/google/android/iwlan/IwlanDataService.java b/src/com/google/android/iwlan/IwlanDataService.java index 04b6789..9c1b549 100644 --- a/src/com/google/android/iwlan/IwlanDataService.java +++ b/src/com/google/android/iwlan/IwlanDataService.java @@ -975,12 +975,12 @@ public class IwlanDataService extends DataService { // This may not result in actual closing of Ike Session since // epdg selection may not be complete yet. tunnelState.setState(TunnelState.TUNNEL_IN_FORCE_CLEAN_WAS_IN_BRINGUP); - getTunnelManager() - .closeTunnel( - entry.getKey(), - true /* forceClose */, - getIwlanTunnelCallback(), - getIwlanTunnelMetrics()); + getTunnelManager() + .closeTunnel( + entry.getKey(), + true /* forceClose */, + getIwlanTunnelCallback(), + getIwlanTunnelMetrics()); } } } @@ -1444,6 +1444,12 @@ public class IwlanDataService extends DataService { return; } + // Update Network & LinkProperties to EpdgTunnelManager + iwlanDataServiceProvider + .getTunnelManager() + .updateNetwork(sNetwork, sLinkProperties); + Log.d(TAG, "Update Network for SetupDataCall request"); + tunnelState = iwlanDataServiceProvider.mTunnelStateForApn.get( dataProfile.getApnSetting().getApnName()); @@ -1884,9 +1890,9 @@ public class IwlanDataService extends DataService { hasNetworkConnectedChanged = true; } - sNetworkConnected = networkConnected; sDefaultDataTransport = transport; sNetwork = network; + sNetworkConnected = networkConnected; if (networkConnected) { if (hasTransportChanged) { |