| commit | 9cbb846a5d7d176aeb50f96930643a071214bdf3 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Sat Sep 03 03:55:13 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 03 03:55:13 2022 +0000 |
| tree | 4033d4d9752586a6bb418428d50b271c91b25dd6 | |
| parent | 66248fccf5cf937ded9935974e85a03785f553f5 [diff] | |
| parent | 2d6264f67917b863bb8086382f97e0d624db66e8 [diff] |
Merge "Allow connectToCell multiple times" am: 2d6264f679 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2200166 Change-Id: Ic8a911a014d74b267b84f037486516f3f059d11f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java index f035f72..9d1fa60 100644 --- a/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java +++ b/tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
@@ -357,7 +357,7 @@ public Network connectToCell() throws InterruptedException { if (cellConnectAttempted()) { - throw new IllegalStateException("Already connected"); + mCm.unregisterNetworkCallback(mCellNetworkCallback); } NetworkRequest cellRequest = new NetworkRequest.Builder() .addTransportType(TRANSPORT_CELLULAR)