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

Commit 1e93ab55 authored by Orion Hodson's avatar Orion Hodson
Browse files

Rename jniGetReferent to GetReferent and cache the method id it uses. 

Fix: 168471625
Test: TH
Change-Id: I80ecb478c72f81f1e8dbadfb156c3bf75d507af3
parent 06471ce8

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ cc_library_shared { 
        "android_util_XmlBlock.cpp",

        "android_util_jar_StrictJarFile.cpp",

        "com_android_internal_util_VirtualRefBasePtr.cpp",

        "core_jni_helpers.cpp",

        ":deviceproductinfoconstants_aidl",

    ],

core/jni/android_hardware_SensorManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ private: 
    virtual int handleEvent(int fd, int events, void* data) {

        JNIEnv* env = AndroidRuntime::getJNIEnv();

        sp<SensorEventQueue> q = reinterpret_cast<SensorEventQueue *>(data);

        ScopedLocalRef<jobject> receiverObj(env, jniGetReferent(env, mReceiverWeakGlobal));

        ScopedLocalRef<jobject> receiverObj(env, GetReferent(env, mReceiverWeakGlobal));



        ssize_t n;

        ASensorEvent buffer[16];

core/jni/android_view_DisplayEventReceiver.cpp

+4 −4
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ void NativeDisplayEventReceiver::dispatchVsync(nsecs_t timestamp, PhysicalDispla 
                                               uint32_t count, VsyncEventData vsyncEventData) {

    JNIEnv* env = AndroidRuntime::getJNIEnv();



    ScopedLocalRef<jobject> receiverObj(env, jniGetReferent(env, mReceiverWeakGlobal));

    ScopedLocalRef<jobject> receiverObj(env, GetReferent(env, mReceiverWeakGlobal));

    if (receiverObj.get()) {

        ALOGV("receiver %p ~ Invoking vsync handler.", this);

        env->CallVoidMethod(receiverObj.get(), gDisplayEventReceiverClassInfo.dispatchVsync,
@@ -118,7 +118,7 @@ void NativeDisplayEventReceiver::dispatchHotplug(nsecs_t timestamp, PhysicalDisp 
                                                 bool connected) {

    JNIEnv* env = AndroidRuntime::getJNIEnv();



    ScopedLocalRef<jobject> receiverObj(env, jniGetReferent(env, mReceiverWeakGlobal));

    ScopedLocalRef<jobject> receiverObj(env, GetReferent(env, mReceiverWeakGlobal));

    if (receiverObj.get()) {

        ALOGV("receiver %p ~ Invoking hotplug handler.", this);

        env->CallVoidMethod(receiverObj.get(), gDisplayEventReceiverClassInfo.dispatchHotplug,
@@ -133,7 +133,7 @@ void NativeDisplayEventReceiver::dispatchModeChanged(nsecs_t timestamp, Physical 
                                                     int32_t modeId, nsecs_t) {

    JNIEnv* env = AndroidRuntime::getJNIEnv();



    ScopedLocalRef<jobject> receiverObj(env, jniGetReferent(env, mReceiverWeakGlobal));

    ScopedLocalRef<jobject> receiverObj(env, GetReferent(env, mReceiverWeakGlobal));

    if (receiverObj.get()) {

        ALOGV("receiver %p ~ Invoking mode changed handler.", this);

        env->CallVoidMethod(receiverObj.get(), gDisplayEventReceiverClassInfo.dispatchModeChanged,
@@ -148,7 +148,7 @@ void NativeDisplayEventReceiver::dispatchFrameRateOverrides( 
        nsecs_t timestamp, PhysicalDisplayId displayId, std::vector<FrameRateOverride> overrides) {

    JNIEnv* env = AndroidRuntime::getJNIEnv();



    ScopedLocalRef<jobject> receiverObj(env, jniGetReferent(env, mReceiverWeakGlobal));

    ScopedLocalRef<jobject> receiverObj(env, GetReferent(env, mReceiverWeakGlobal));

    if (receiverObj.get()) {

        ALOGV("receiver %p ~ Invoking FrameRateOverride handler.", this);

        const auto frameRateOverrideClass =

core/jni/android_view_InputEventReceiver.cpp

+2 −2
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ status_t NativeInputEventReceiver::consumeEvents(JNIEnv* env, 
            if (!skipCallbacks && !mBatchedInputEventPending && mInputConsumer.hasPendingBatch()) {

                // There is a pending batch.  Come back later.

                if (!receiverObj.get()) {

                    receiverObj.reset(jniGetReferent(env, mReceiverWeakGlobal));

                    receiverObj.reset(GetReferent(env, mReceiverWeakGlobal));

                    if (!receiverObj.get()) {

                        ALOGW("channel '%s' ~ Receiver object was finalized "

                              "without being disposed.",
@@ -357,7 +357,7 @@ status_t NativeInputEventReceiver::consumeEvents(JNIEnv* env, 


        if (!skipCallbacks) {

            if (!receiverObj.get()) {

                receiverObj.reset(jniGetReferent(env, mReceiverWeakGlobal));

                receiverObj.reset(GetReferent(env, mReceiverWeakGlobal));

                if (!receiverObj.get()) {

                    ALOGW("channel '%s' ~ Receiver object was finalized "

                            "without being disposed.", getInputChannelName().c_str());

core/jni/android_view_InputEventSender.cpp

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ status_t NativeInputEventSender::processConsumerResponse(JNIEnv* env) { 
        ALOGD("channel '%s' ~ Receiving finished signals.", getInputChannelName().c_str());

    }



    ScopedLocalRef<jobject> senderObj(env, jniGetReferent(env, mSenderWeakGlobal));

    ScopedLocalRef<jobject> senderObj(env, GetReferent(env, mSenderWeakGlobal));

    if (!senderObj.get()) {

        ALOGW("channel '%s' ~ Sender object was finalized without being disposed.",

              getInputChannelName().c_str());