Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2
* dev/10/fp2/security-aosp-qt-release:
wifi: Reset to default SAP configuration when doing factory reset
Change-Id: I0861761cf147e2e8890645d1ac3510621f011be3
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 6126055..b48e801 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -2987,6 +2987,9 @@
}
mWifiInjector.getClientModeImplHandler().post(() -> {
+ EventLog.writeEvent(0x534e4554, "241927115", -1,
+ "Reset SoftApConfiguration to default configuration");
+ mWifiApConfigStore.setApConfiguration(null);
mWifiInjector.getWifiConfigManager().clearDeletedEphemeralNetworks();
mClientModeImpl.clearNetworkRequestUserApprovedAccessPoints();
mWifiNetworkSuggestionsManager.clear();
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
index 3f9338c..b22ed91 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
@@ -3662,6 +3662,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);