Merge "Do clean up on changing of the wifi configuration credential." into rvc-qpr-dev

2 files changed, 7 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index 866782ad3..e88eefc6d 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -1113,6 +1113,10 @@ public class ClientModeImpl extends StateMachine {
             // Clear invalid cached data.
             mWifiNative.removeNetworkCachedData(oldConfig.networkId);
 
+            if (WifiConfigurationUtil.hasCredentialChanged(oldConfig, newConfig)) {
+                mBssidBlocklistMonitor.handleNetworkRemoved(newConfig.SSID);
+            }
+
             // Check if user/app change meteredOverride for connected network.
             if (newConfig.networkId != mLastNetworkId
                     || newConfig.meteredOverride == oldConfig.meteredOverride) {
diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
index e5fda6774..f37472ead 100644
--- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java
+++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
@@ -307,6 +307,9 @@ public class WifiConfigurationUtil {
         if (existingConfig.requirePmf != newConfig.requirePmf) {
             return true;
         }
+        if (existingConfig.carrierId != newConfig.carrierId) {
+            return true;
+        }
         if (hasEnterpriseConfigChanged(existingConfig.enterpriseConfig,
                 newConfig.enterpriseConfig)) {
             return true;