| commit | 1d99a55ff542192a4919eba077f3e010344876b2 | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Thu Jul 27 11:44:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 27 11:44:46 2023 +0000 |
| tree | a2d1863073f80f15e0631e64ac443319b4b6badf | |
| parent | 88cf7d1354c3fe425be3154e30f8fe918dd09d08 [diff] | |
| parent | 0837019a95003c9c8568372ae9587a8d56cf26e5 [diff] |
Merge "Fix ConnectivityManagerTest#testFactoryReset flaky" into main am: 734738767c am: 9931686d78 am: 0837019a95 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2678017 Change-Id: I9fd3555b5c15ed65702878227ff145fcab8f1f3b 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 ade89c0..5f4eb7c 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -2591,6 +2591,7 @@ // prevent the race condition between airplane mode enabled and the followed // up wifi tethering enabled. tetherEventCallback.expectNoTetheringActive(); + tetherUtils.expectSoftApDisabled(); // start wifi tethering tetherUtils.startWifiTethering(tetherEventCallback);