Merge "Merge "[CTS] Fix testAddOrUpdatePasspointConfiguration in WifiManagerTest" into rvc-dev am: e9daa4307e am: e9bcdaea4b" into rvc-d1-dev-plus-aosp am: 887db5a677 am: 582b00edc7

Change-Id: Id7823442c0eade09740e724842e2130cef35b535
This commit is contained in:
Automerger Merge Worker
2020-03-26 18:23:14 +00:00

View File

@@ -2471,15 +2471,21 @@ public class WifiManagerTest extends AndroidTestCase {
// Create and install a Passpoint configuration
PasspointConfiguration passpointConfiguration = createPasspointConfiguration();
mWifiManager.addOrUpdatePasspointConfiguration(passpointConfiguration);
UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
try {
uiAutomation.adoptShellPermissionIdentity();
mWifiManager.addOrUpdatePasspointConfiguration(passpointConfiguration);
// Compare configurations
List<PasspointConfiguration> configurations = mWifiManager.getPasspointConfigurations();
assertNotNull(configurations);
assertEquals(passpointConfiguration, configurations.get(0));
// Compare configurations
List<PasspointConfiguration> configurations = mWifiManager.getPasspointConfigurations();
assertNotNull(configurations);
assertEquals(passpointConfiguration, configurations.get(0));
// Clean up
mWifiManager.removePasspointConfiguration(passpointConfiguration.getHomeSp().getFqdn());
// Clean up
mWifiManager.removePasspointConfiguration(passpointConfiguration.getHomeSp().getFqdn());
} finally {
uiAutomation.dropShellPermissionIdentity();
}
}
/**