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

Commit 60fbda1f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Binder: avoid GC while holding lock" into main am: 4762c3de am: 5ec41f9a 

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



Change-Id: I1d1bd37697542aa75417a80742d78129653af58b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61468e66 5ec41f9a

core/jni/android_util_Binder.cpp

+19 −4
Original line number Diff line number Diff line
@@ -465,11 +465,26 @@ class JavaBBinderHolder 
{

public:

    sp<JavaBBinder> get(JNIEnv* env, jobject obj)

    {

        sp<JavaBBinder> b;

        {

            AutoMutex _l(mLock);

        sp<JavaBBinder> b = mBinder.promote();

        if (b == NULL) {

            // must take lock to promote because we set the same wp<>

            // on another thread.

            b = mBinder.promote();

        }



        if (b) return b;



        // b/360067751: constructor may trigger GC, so call outside lock

        b = new JavaBBinder(env, obj);



        {

            AutoMutex _l(mLock);

            // if it was constructed on another thread in the meantime,

            // return that. 'b' will just get destructed.

            if (sp<JavaBBinder> b2 = mBinder.promote(); b2) return b2;



            if (mVintf) {

                ::android::internal::Stability::markVintf(b.get());

            }