DO NOT MERGE: Fix to enable reconnecting to a Carrier network.

We now generate a new Config for each connection attempt.
BUG: 30760683

Change-Id: I88393ecc2964e299e80f6f2802dd85a142e1f473

1 files changed, 7 insertions, 4 deletions

diff --git a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java
index 3cc471ac3..1e7560346 100644
--- a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java
+++ b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java
@@ -1092,14 +1092,17 @@ public class WifiQualifiedNetworkSelector {
             return null;
         }
 
+        WifiConfiguration newUntrustedCandidateConfig =
+                new WifiConfiguration(untrustedCandidateConfig);
+
         // Mark this config as ephemeral so it isn't persisted.
-        untrustedCandidateConfig.ephemeral = true;
+        newUntrustedCandidateConfig.ephemeral = true;
         // Mark this config as a Carrier Network.
-        untrustedCandidateConfig.isCarrierNetwork = true;
+        newUntrustedCandidateConfig.isCarrierNetwork = true;
 
         mWifiConfigManager.saveNetworkAndSetCandidate(
-                untrustedCandidateConfig, untrustedCarrierScanResult);
-        return untrustedCandidateConfig;
+                newUntrustedCandidateConfig, untrustedCarrierScanResult);
+        return newUntrustedCandidateConfig;
     }
 
     /**