| commit | 0712d59d98c233cdfe68de01bfbbf37f95d762d5 | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Thu Jul 27 09:54:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 27 09:54:44 2023 +0000 |
| tree | af85af951a36593c786376e460d28eca4a6e2483 | |
| parent | d59c46a4581108034e7ab6fc98f55ed276f7ec77 [diff] | |
| parent | 76edec4f97400fd10bfe46c1d4f8e479d34b861c [diff] |
Merge "Revert "Diable ConnectivityManagerTest#testFactoryReset"" into main am: 76edec4f97 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2678016 Change-Id: Ic51d50d963660784fac5fa8e64a8f65c04d1006e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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.