commit 666b32611a43bdd020f9e92f2f5283e7b2a8809e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 11 04:31:09 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 11 04:31:09 2022 +0000
tree f5a28318dcd768bfa5fd574391f303e22c6a5fe2
parent 4074761ea4dca317d8654ee211e065c3804180f1
parent c0a5dc3523fc51a10a54b0b284173819155173b9

Merge cherrypicks of [17123090] into sc-d2-release.

Change-Id: I5455d15e52637e9ceb9dd317982cee9e326253f0

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..3bcb2fe 100644
--- a/src/com/google/android/iwlan/epdg/EpdgTunnelManager.java
+++ b/src/com/google/android/iwlan/epdg/EpdgTunnelManager.java
@@ -1320,6 +1320,13 @@
                     apnName = updatedNetwork.getApnName();
                     Network network = updatedNetwork.getNetwork();
                     tunnelConfig = mApnNameToTunnelConfig.get(apnName);
+
+                    // Update the global cache if they aren't equal
+                    if (!mNetwork.equals(network)) {
+                        Log.d(TAG, "Updating mNetwork to " + network);
+                        mNetwork = network;
+                    }
+
                     if (tunnelConfig == null) {
                         Log.d(TAG, "Update Network request: No tunnel exists for apn: " + apnName);
                     } else {