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

Commit f9feb71e authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "BBQ: Attach calling thread to jvm if needed" into tm-qpr-dev am: cdb26776 

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



Change-Id: Ia838f42a588455a11fbca5d2ee4cc3d1d6bbe2a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18f2a05b cdb26776

core/jni/android_graphics_BLASTBufferQueue.cpp

+10 −11
Original line number Diff line number Diff line
@@ -41,7 +41,12 @@ struct { 


static JNIEnv* getenv(JavaVM* vm) {

    JNIEnv* env;

    if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {

    auto result = vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);

    if (result == JNI_EDETACHED) {

        if (vm->AttachCurrentThreadAsDaemon(&env, nullptr) != JNI_OK) {

            LOG_ALWAYS_FATAL("Failed to AttachCurrentThread!");

        }

    } else if (result != JNI_OK) {

        LOG_ALWAYS_FATAL("Failed to get JNIEnv for JavaVM: %p", vm);

    }

    return env;
@@ -60,15 +65,15 @@ public: 
    }



    ~TransactionHangCallbackWrapper() {

        if (mTransactionHangObject) {

            getenv()->DeleteGlobalRef(mTransactionHangObject);

        if (mTransactionHangObject != nullptr) {

            getenv(mVm)->DeleteGlobalRef(mTransactionHangObject);

            mTransactionHangObject = nullptr;

        }

    }



    void onTransactionHang(bool isGpuHang) {

        if (mTransactionHangObject) {

            getenv()->CallVoidMethod(mTransactionHangObject,

            getenv(mVm)->CallVoidMethod(mTransactionHangObject,

                                        gTransactionHangCallback.onTransactionHang, isGpuHang);

        }

    }
@@ -76,12 +81,6 @@ public: 
private:

    JavaVM* mVm;

    jobject mTransactionHangObject;



    JNIEnv* getenv() {

        JNIEnv* env;

        mVm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);

        return env;

    }

};



static jlong nativeCreate(JNIEnv* env, jclass clazz, jstring jName,