| commit | 4aa330c0424056df14a9b464a331b6b3dc949b0f | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Tue Mar 14 23:22:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 14 23:22:32 2023 +0000 |
| tree | cf2147bdc406c3f6f7370629c0b201ffea1779d5 | |
| parent | caa1aefeb5e6932a426c9721f4c61a3a32b0f181 [diff] | |
| parent | b2007796bb43550b0849b2dd84ed217e03c8d3d3 [diff] |
Merge "EthernetTetheringTest: join handler thread after calling quitSafely" am: 78fd43ec67 am: b2007796bb Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2485639 Change-Id: I1ff76ca12051f784c2acf6aa127d64f218dc68d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java b/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java index f2cf1d0..69eb58f 100644 --- a/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java +++ b/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
@@ -253,6 +253,7 @@ if (mRunTests) cleanUp(); } finally { mHandlerThread.quitSafely(); + mHandlerThread.join(); mUiAutomation.dropShellPermissionIdentity(); } }