From 0328224348fe41e2df48e811d5311c90209cd40e Mon Sep 17 00:00:00 2001
From: Hai Shalom <haishalom@google.com>
Date: Mon, 3 Aug 2020 15:44:42 -0700
Subject: Flush ANQP caches when toggling Wi-Fi off

Bug: 154217281
Test: atest ClientModeImplTest
Test: Toggle Wi-Fi off, verify ANQP caches are flushed
Change-Id: I8a55771d1062a12e12ca37b2f34e15b5ead8fb65
Merged-In: I8a55771d1062a12e12ca37b2f34e15b5ead8fb65
(cherry picked from commit 103512e9be756fa95e5a57525b57eca5a4b582a4)
---
 service/java/com/android/server/wifi/ClientModeImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'service')

diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index fd79d8258..c1768eca9 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -3686,9 +3686,10 @@ public class ClientModeImpl extends StateMachine {
         // TODO: b/79504296 This broadcast has been deprecated and should be removed
         sendSupplicantConnectionChangedBroadcast(false);
 
-        // Let's remove any ephemeral or passpoint networks.
+        // Remove any ephemeral or Passpoint networks, flush ANQP cache
         mWifiConfigManager.removeAllEphemeralOrPasspointConfiguredNetworks();
         mWifiConfigManager.clearUserTemporarilyDisabledList();
+        mPasspointManager.clearAnqpRequestsAndFlushCache();
     }
 
     void registerConnected() {
-- 
cgit v1.2.3