commit 76edec4f97400fd10bfe46c1d4f8e479d34b861c
author Mark Chien <markchien@google.com> Thu Jul 27 09:11:11 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 27 09:11:11 2023 +0000
tree af85af951a36593c786376e460d28eca4a6e2483
parent b868a462fd3c4b4692c1685cdd7e794e355308ec
parent dfdc21bc6b311fee675294c35ff11f11f9bc7849

Merge "Revert "Diable ConnectivityManagerTest#testFactoryReset"" into main

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index a0508e1..ade89c0 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -2560,10 +2560,9 @@
         assertThrows(SecurityException.class, () -> mCm.factoryReset());
     }
 
-    // @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 {
+    @AppModeFull(reason = "Cannot get WifiManager in instant app mode")
+    @Test
+    public void testFactoryReset() throws Exception {
         assumeTrue(TestUtils.shouldTestSApis());
 
         // Store current settings.