Merge "SoundPool: Fix stream playback thread startup wait" into rvc-dev

2020-03-20 20:52:49 +00:00
parent 7bc7f92228 ba04dbe773
commit dc828817e5
1 changed files with 4 additions and 2 deletions
--- a/media/jni/soundpool/StreamManager.cpp
+++ b/media/jni/soundpool/StreamManager.cpp
@@ -340,8 +340,10 @@ void StreamManager::run(int32_t id)
    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();