commit c696a26c8a2a24c55db1b5883f1eab0f9602aa42
author Mikhail Naganov <mnaganov@google.com> Tue Oct 15 22:06:46 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 15 22:06:46 2019 -0700
tree 4fa374954d92e9af5d6ff0124656b0030ed84d8e
parent 55458ad48b5b5349b1be836e082b2056974bc195
parent cfbdd6d6e73d70ad93788bd7da868528836431e8

Merge "Audio: Ensure input stream gets closed on the audio HAL server side" am: d405ef1c19 am: 5bc9035530 am: d51753b418
am: cfbdd6d6e7

Change-Id: If02e1c5420b6618e2ef3cb496a38c281a3d0a1a4

audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp

diff --git a/audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp b/audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp
index 022f75e..2814c63 100644
--- a/audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp
+++ b/audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp
@@ -117,6 +117,10 @@
                 ASSERT_NE(0U, activeMicrophones.size());
             }
             stream->close();
+            // Workaround for b/139329877. Ensures the stream gets closed on the audio hal side.
+            stream.clear();
+            IPCThreadState::self()->flushCommands();
+            usleep(1000);
             if (efGroup) {
                 EventFlag::deleteEventFlag(&efGroup);
             }