diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-18 07:24:12 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-18 07:24:12 +0000 |
| commit | 0b601b14e4eed83fa2e2fa4235cdb12bff908f6f (patch) | |
| tree | 26462ba7e3a89444f5e97e41a2cb14960be483c1 | |
| parent | 77d723af65cd8b8d3423f37521b420a7e1ecf408 (diff) | |
| parent | f7c433a8a81cad96b39e1fedbf7bcc580183d5ac (diff) | |
| download | wifi-0b601b14e4eed83fa2e2fa4235cdb12bff908f6f.tar.gz | |
Merge cherrypicks of [19693914] into rvc-platform-release.android-platform-11.0.0_r25
Change-Id: I2aac75d58434fde40acd89b4bcc2745559e7b922
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 3 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index d03e3eb9e..d29c88510 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -3467,6 +3467,9 @@ public class WifiServiceImpl extends BaseWifiService { 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 8cb5ee123..2fd5c877e 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java @@ -4221,7 +4221,7 @@ public class WifiServiceImplTest extends WifiBaseTest { // 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( |