commit ba04dbe7732bc2d016bf81c81bd349d931de63f2
author Andy Hung <hunga@google.com> Thu Mar 19 21:32:53 2020 -0700
committer Andy Hung <hunga@google.com> Fri Mar 20 11:18:25 2020 -0700
tree 7ba58b654b16dece2df58d1ce5b1bb52a3aa62aa
parent 6051bff9dadd2f1ff39f7769b10dc7679c9c3f70

SoundPool: Fix stream playback thread startup wait

Test: see bug for details, verified by logcat and sound analysis
Test: SoundPool(Aac|Haptic|Midi|Ogg)Test
Bug: 151781575
Change-Id: Iba65953cdfa4ab1cabc33650790e9fd5a2787786

media/jni/soundpool/StreamManager.cpp

diff --git a/media/jni/soundpool/StreamManager.cpp b/media/jni/soundpool/StreamManager.cpp
index 79e4d8a..c612218 100644
--- a/media/jni/soundpool/StreamManager.cpp
+++ b/media/jni/soundpool/StreamManager.cpp
@@ -340,8 +340,10 @@
     int64_t waitTimeNs = kWaitTimeBeforeCloseNs;
     std::unique_lock lock(mStreamManagerLock);
     while (!mQuit) {
-        mStreamManagerCondition.wait_for(
-                lock, std::chrono::duration<int64_t, std::nano>(waitTimeNs));
+        if (mRestartStreams.empty()) { // on thread start, mRestartStreams can be non-empty.
+            mStreamManagerCondition.wait_for(
+                    lock, std::chrono::duration<int64_t, std::nano>(waitTimeNs));
+        }
         ALOGV("%s(%d) awake", __func__, id);
 
         sanityCheckQueue_l();