Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 341c75f6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9416697 from 65dae2bc to tm-qpr2-release

Change-Id: Ic8fbeb16e1dc2327e785f3d052b6a2886428e8ab
parents fc0a052c 65dae2bc
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -354,8 +354,11 @@ status_t MediaCodec::ResourceManagerServiceProxy::init() {
}

//static
Mutex MediaCodec::ResourceManagerServiceProxy::sLockCookies;
std::set<void*> MediaCodec::ResourceManagerServiceProxy::sCookies;
// these are no_destroy to keep them from being destroyed at process exit
// where some thread calls exit() while other threads are still running.
// see b/194783918
[[clang::no_destroy]] Mutex MediaCodec::ResourceManagerServiceProxy::sLockCookies;
[[clang::no_destroy]] std::set<void*> MediaCodec::ResourceManagerServiceProxy::sCookies;

//static
void MediaCodec::ResourceManagerServiceProxy::addCookie(void* cookie) {