Merge "[CTS] Fix testAddOrUpdatePasspointConfiguration in WifiManagerTest" into rvc-dev
diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
index 4cbdf62..0cf984c 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -2471,15 +2471,21 @@
// 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();
+ }
}
/**