LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "wifi: catch UnsupportedOperationException for devices with Passpoint disabled" into oc-dev

Browse Source 
am: 3deeed9a45

Change-Id: I3a5963931d2359b51cec75e9a7bac8530c18b785
This commit is contained in:
Peter Qiu
2017-04-04 02:26:20 +00:00
committed by android-build-merger
parent a7eadf8ce6 b45c3dc6f1
commit 9c7299bacb
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
View File

@@ -587,6 +587,10 @@ public class WifiManagerTest extends AndroidTestCase {
private PasspointConfiguration generatePasspointConfig(Credential credential) {
PasspointConfiguration config = new PasspointConfiguration();
config.setCredential(credential);
// Setting update identifier to indicate R2 configuration, to avoid CA
// certificate being verified, since we're using a fake CA certificate
// for testing.
config.setUpdateIdentifier(1);
// Setup HomeSp.
HomeSp homeSp = new HomeSp();
@@ -656,22 +660,26 @@ public class WifiManagerTest extends AndroidTestCase {
* @param config The configuration to test with
*/
private void testAddPasspointConfig(PasspointConfiguration config) throws Exception {
mWifiManager.addOrUpdatePasspointConfiguration(config);
try {
mWifiManager.addOrUpdatePasspointConfiguration(config);
// Certificates and keys will be set to null after it is installed to the KeyStore by
// WifiManager. Reset them in the expected config so that it can be used to compare
// against the retrieved config.
config.getCredential().setCaCertificate(null);
config.getCredential().setClientCertificateChain(null);
config.getCredential().setClientPrivateKey(null);
// Certificates and keys will be set to null after it is installed to the KeyStore by
// WifiManager. Reset them in the expected config so that it can be used to compare
// against the retrieved config.
config.getCredential().setCaCertificate(null);
config.getCredential().setClientCertificateChain(null);
config.getCredential().setClientPrivateKey(null);
// Retrieve the configuration and verify it.
List<PasspointConfiguration> configList = mWifiManager.getPasspointConfigurations();
assertEquals(1, configList.size());
assertEquals(config, configList.get(0));
// Retrieve the configuration and verify it.
List<PasspointConfiguration> configList = mWifiManager.getPasspointConfigurations();
assertEquals(1, configList.size());
assertEquals(config, configList.get(0));
// Remove the configuration and verify no installed configuration.
mWifiManager.removePasspointConfiguration(config.getHomeSp().getFqdn());
assertTrue(mWifiManager.getPasspointConfigurations().isEmpty());
// Remove the configuration and verify no installed configuration.
mWifiManager.removePasspointConfiguration(config.getHomeSp().getFqdn());
assertTrue(mWifiManager.getPasspointConfigurations().isEmpty());
} catch (UnsupportedOperationException e) {
// Passpoint build config |config_wifi_hotspot2_enabled| is disabled, so noop.
}
}
}