Merge "Wifi: remove PMK cache in supplicant due to sim removal" into rvc-dev

1 files changed, 3 insertions, 2 deletions

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index d3bbdfdc8..be3b3132c 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -4897,9 +4897,10 @@ public class ClientModeImpl extends StateMachine {
                                         && !mTelephonyUtil.isSimPresent(mLastSubId))) {
                             mWifiMetrics.logStaEvent(StaEvent.TYPE_FRAMEWORK_DISCONNECT,
                                     StaEvent.DISCONNECT_RESET_SIM_NETWORKS);
-
-                            mWifiNative.disconnect(mInterfaceName);
+                            // remove local PMKSA cache in framework
                             mWifiNative.removeNetworkCachedData(mLastNetworkId);
+                            // remove network so that supplicant's PMKSA cache is cleared
+                            mWifiNative.removeAllNetworks(mInterfaceName);
                             mSimRequiredNotifier.showSimRequiredNotification(
                                     config, mLastSimBasedConnectionCarrierName);
                             transitionTo(mDisconnectingState);