Merge "[CTS] Fix testAddOrUpdatePasspointConfiguration in WifiManagerTest" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-03-26 17:51:41 +00:00
committed by Android (Google) Code Review

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();
}
}
/**