Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SoundPool: Fix StreamManager JavaThread shutdown" into rvc-dev am: e68ae63ead

Browse Source 
Change-Id: I587eef7ee3ece6a94f1689a01fd32edfde7a327c
This commit is contained in:
Automerger Merge Worker
2020-03-04 01:55:16 +00:00
parent efe17aca3e e68ae63ead
commit 260d05925f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/jni/soundpool/StreamManager.h
View File

@@ -52,6 +52,12 @@ public:
JavaThread(JavaThread &&) = delete; // uses "this" ptr, not moveable. JavaThread(JavaThread &&) = delete; // uses "this" ptr, not moveable.
~JavaThread() {
join(); // manually block until the future is ready as std::future
// destructor doesn't block unless it comes from std::async
// and it is the last reference to shared state.
}
void join() const { void join() const {
mFuture.wait(); mFuture.wait();
} }
@@ -64,8 +70,9 @@ private:
static int staticFunction(void *data) { static int staticFunction(void *data) {
JavaThread *jt = static_cast<JavaThread *>(data); JavaThread *jt = static_cast<JavaThread *>(data);
jt->mF(); jt->mF();
jt->mIsClosed = true;
jt->mPromise.set_value(); jt->mPromise.set_value();
jt->mIsClosed = true; // publicly inform that we are closed
// after we have accessed all variables.
return 0; return 0;
} }