Merge "wifi: update callsite for Passpoint configuration management APIs"

am: c77019853f

Change-Id: If3aadefde81b4998f2c86a5bc3e074aa3a8582b2
This commit is contained in:
Peter Qiu
2017-03-14 16:17:27 +00:00
committed by android-build-merger

View File

@@ -656,7 +656,7 @@ public class WifiManagerTest extends AndroidTestCase {
* @param config The configuration to test with * @param config The configuration to test with
*/ */
private void testAddPasspointConfig(PasspointConfiguration config) throws Exception { private void testAddPasspointConfig(PasspointConfiguration config) throws Exception {
assertTrue(mWifiManager.addOrUpdatePasspointConfiguration(config)); mWifiManager.addOrUpdatePasspointConfiguration(config);
// Certificates and keys will be set to null after it is installed to the KeyStore by // 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 // WifiManager. Reset them in the expected config so that it can be used to compare
@@ -671,7 +671,7 @@ public class WifiManagerTest extends AndroidTestCase {
assertEquals(config, configList.get(0)); assertEquals(config, configList.get(0));
// Remove the configuration and verify no installed configuration. // Remove the configuration and verify no installed configuration.
assertTrue(mWifiManager.removePasspointConfiguration(config.getHomeSp().getFqdn())); mWifiManager.removePasspointConfiguration(config.getHomeSp().getFqdn());
assertTrue(mWifiManager.getPasspointConfigurations().isEmpty()); assertTrue(mWifiManager.getPasspointConfigurations().isEmpty());
} }
} }