diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-10-13 18:33:04 +0000 |
|---|---|---|
| committer | Grace Jia <xiaotonj@google.com> | 2023-01-03 19:42:35 +0000 |
| commit | e1c11a69e45a4af0404d668174aa3e6b2342b8c5 (patch) | |
| tree | 55c516ecabb27181c630e7a65a2110ef7de22827 | |
| parent | 08cc91d48bb772253ceefdd1dc8f4b1676c9fa17 (diff) | |
| download | cts-e1c11a69e45a4af0404d668174aa3e6b2342b8c5.tar.gz | |
Merge "Tear down RemoteConferenceTest properly to avoid test failures." am: c23b144eba
Original change: https://android-review.googlesource.com/c/platform/cts/+/2252972
Bug: b/262919168
Change-Id: I2234d574907a2a880ea3e1fbc7c1084fca2ac699
Merged-In: I2234d574907a2a880ea3e1fbc7c1084fca2ac699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from commit 17566439d4e8ca4f892cc56e2c2a8318761c713a)
| -rw-r--r-- | tests/tests/telecom/src/android/telecom/cts/RemoteConferenceTest.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/tests/telecom/src/android/telecom/cts/RemoteConferenceTest.java b/tests/tests/telecom/src/android/telecom/cts/RemoteConferenceTest.java index 12574e27695..226cc809a0e 100644 --- a/tests/tests/telecom/src/android/telecom/cts/RemoteConferenceTest.java +++ b/tests/tests/telecom/src/android/telecom/cts/RemoteConferenceTest.java @@ -16,7 +16,8 @@ package android.telecom.cts; -import static android.telecom.cts.TestUtils.*; +import static android.telecom.cts.TestUtils.InvokeCounter; +import static android.telecom.cts.TestUtils.WAIT_FOR_STATE_CHANGE_TIMEOUT_MS; import android.os.Bundle; import android.os.Handler; @@ -29,7 +30,6 @@ import android.telecom.PhoneAccountHandle; import android.telecom.RemoteConference; import android.telecom.RemoteConnection; import android.telecom.TelecomManager; -import android.util.Log; import java.util.ArrayList; import java.util.List; @@ -59,6 +59,13 @@ public class RemoteConferenceTest extends BaseRemoteTelecomTest { MockConference mConference, mRemoteConference; RemoteConference mRemoteConferenceObject; + @Override + public void tearDown() throws Exception { + mRemoteConference.destroy(); + mConference.destroy(); + super.tearDown(); + } + public void testRemoteConferenceCreate() { if (!mShouldTestTelecom) { return; |