commit b38b574ef560e1c6c66776bcd64be046a217e01a
author Les Lee <lesl@google.com> Mon Aug 22 15:50:56 2022 +0800
committer Bharath <bharath@teamb58.org> Wed Feb 01 16:13:10 2023 +0530
tree a14412be4eea34719203013d9d78b2b4fb19905f
parent ea898ea820efe8089e097bd4b5d3591c6ff4cb45

wifi: Reset to default SAP configuration when doing factory reset

Bug: 241927115
Test: atest -c FrameworksWifiTests
Change-Id: I6ff8991da2a1fbd723285e21b15aa1f2091f676f
Merged-In: Ia212666450fd9fe3a95393defa2fb56383bab83a
(cherry picked from commit e025228677a276a96a4c18e199181b663a7649fe)
Merged-In: I6ff8991da2a1fbd723285e21b15aa1f2091f676f

service/java/com/android/server/wifi/WifiServiceImpl.java

diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index e8b523b..81beab0 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -2972,6 +2972,9 @@
             }
 
             mWifiInjector.getClientModeImplHandler().post(() -> {
+                EventLog.writeEvent(0x534e4554, "241927115", -1,
+                        "Reset SoftApConfiguration to default configuration");
+                mWifiApConfigStore.setApConfiguration(null);
                 mWifiInjector.getWifiConfigManager().clearDeletedEphemeralNetworks();
                 mClientModeImpl.clearNetworkRequestUserApprovedAccessPoints();
                 mWifiNetworkSuggestionsManager.clear();

tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
index f6f25a7..73b2ee1 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
@@ -3518,6 +3518,7 @@
         mWifiServiceImpl.factoryReset(TEST_PACKAGE_NAME);
         mLooper.dispatchAll();
 
+        verify(mWifiApConfigStore).setApConfiguration(null);
         verify(mClientModeImpl).syncRemoveNetwork(mAsyncChannel, openNetwork.networkId);
         verify(mClientModeImpl).syncRemoveNetwork(mAsyncChannel, eapNetwork.networkId);
         verify(mWifiKeyStore).removeKeys(eapNetwork.enterpriseConfig, true);