| commit | 9931686d78a5f7a3f0aed76c40dabef0deb6ea5f | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Thu Jul 27 09:55:09 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 27 09:55:09 2023 +0000 |
| tree | 0ddd1808a766c4acafa2aa21683ac4741dc09c69 | |
| parent | 0712d59d98c233cdfe68de01bfbbf37f95d762d5 [diff] | |
| parent | 734738767c334e62ff145b2e2bec038ec2970096 [diff] |
Merge "Fix ConnectivityManagerTest#testFactoryReset flaky" into main am: 734738767c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2678017 Change-Id: I053dafbacf39fadd97021c8b1690342d5524de85 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);