Merge "SoundPool: Update queue only if streamID matches" am: f0f20c17e0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1905390

Change-Id: I2050c35086bf0bd3af5c600d06f399ead24417b3
This commit is contained in:
Andy Hung
2021-12-10 18:49:07 +00:00
committed by Automerger Merge Worker

View File

@@ -185,7 +185,7 @@ void SoundPool::stop(int32_t streamID)
auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr; auto apiLock = kUseApiLock ? std::make_unique<std::lock_guard<std::mutex>>(mApiLock) : nullptr;
soundpool::Stream* stream = mStreamManager.findStream(streamID); soundpool::Stream* stream = mStreamManager.findStream(streamID);
if (stream != nullptr && stream->requestStop(streamID)) { if (stream != nullptr && stream->requestStop(streamID)) {
mStreamManager.moveToRestartQueue(stream); mStreamManager.moveToRestartQueue(stream, streamID);
} }
} }