Merge "Diable ConnectivityManagerTest#testFactoryReset" am: 8c59e582a5 am: 849fcba7ae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2629809 Change-Id: If6d688436ac36fef3b1fb2e28569e0246cbf1daa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
f95243c8c6
1 changed files with 4 additions and 3 deletions
|
|
@ -2560,9 +2560,10 @@ public class ConnectivityManagerTest {
|
|||
assertThrows(SecurityException.class, () -> mCm.factoryReset());
|
||||
}
|
||||
|
||||
@AppModeFull(reason = "Cannot get WifiManager in instant app mode")
|
||||
@Test
|
||||
public void testFactoryReset() throws Exception {
|
||||
// @AppModeFull(reason = "Cannot get WifiManager in instant app mode")
|
||||
// @Test
|
||||
// Temporarily disable the unreliable test, which is blocked by b/254183718.
|
||||
private void testFactoryReset() throws Exception {
|
||||
assumeTrue(TestUtils.shouldTestSApis());
|
||||
|
||||
// Store current settings.
|
||||
|
|
|
|||
Loading…
Reference in a new issue