Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3
* dev/11/fp3/security-aosp-rvc-release:
wifi: Reset to default SAP configuration when doing factory reset
Change-Id: I1c1cc313c4df1ddbf9f245e864344157d6ee19b6
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index ff3f860..4545d52 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -3703,6 +3703,9 @@
removePasspointConfigurationInternal(null, config.getUniqueId());
}
mWifiThreadRunner.post(() -> {
+ EventLog.writeEvent(0x534e4554, "241927115", -1,
+ "Reset SoftApConfiguration to default configuration");
+ mWifiApConfigStore.setApConfiguration(null);
mPasspointManager.clearAnqpRequestsAndFlushCache();
mWifiConfigManager.clearUserTemporarilyDisabledList();
mWifiConfigManager.removeAllEphemeralOrPasspointConfiguredNetworks();
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
index 35aadea..a18f784 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
@@ -4223,7 +4223,7 @@
// Let the final post inside the |factoryReset| method run to completion.
mLooper.dispatchAll();
-
+ verify(mWifiApConfigStore).setApConfiguration(null);
verify(mWifiConfigManager).removeNetwork(
openNetwork.networkId, Binder.getCallingUid(), TEST_PACKAGE_NAME);
verify(mWifiConfigManager).removeNetwork(