From 231eea1a1d10e0e23b4a86241b2464c4c36cd7f1 Mon Sep 17 00:00:00 2001 From: lesl Date: Fri, 19 Jun 2020 17:47:13 +0800 Subject: wifi: Add new overlay to control reset channel config. The device might not support SAP channel customization (UI) or forced channel might not work in some countries. Add overlay to let OEM to decide to reset it during cloud restore. Note: Default will reset channel configuration Bug: 159325231 Test: atest FrameworksWifiTests Change-Id: Id9db5bca469a98c555223c26ad9b37ead7389f9e --- .../wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java index 50fd4d8c1..bc646c1eb 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java @@ -661,16 +661,21 @@ public class WifiApConfigStoreTest extends WifiBaseTest { public void testResetToDefaultForUnsupportedConfig() throws Exception { mResources.setBoolean(R.bool.config_wifiSofapClientForceDisconnectSupported, false); mResources.setBoolean(R.bool.config_wifi_softap_sae_supported, false); + mResources.setBoolean(R.bool.config_wifiSoftapResetChannelConfig, true); SoftApConfiguration sae_config = new SoftApConfiguration.Builder() .setPassphrase("secretsecret", SoftApConfiguration.SECURITY_TYPE_WPA3_SAE) .setMaxNumberOfClients(10) .setClientControlByUserEnabled(true) + .setChannel(149, SoftApConfiguration.BAND_5GHZ) .build(); WifiApConfigStore store = createWifiApConfigStore(); SoftApConfiguration resetedConfig = store.resetToDefaultForUnsupportedConfig(sae_config); assertEquals(resetedConfig.getMaxNumberOfClients(), 0); assertFalse(resetedConfig.isClientControlByUserEnabled()); + assertEquals(resetedConfig.getChannel(), 0); + assertEquals(resetedConfig.getBand(), + SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ); verify(mWifiMetrics).noteSoftApConfigReset(sae_config, resetedConfig); } -- cgit v1.2.3