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

Commit f0ac357a authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "Rename jniGetReferent to GetReferent and cache the method id it uses." am: fe892a0f 

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



Change-Id: I2dfdec571499cb10db92afe52b23ef0f585a5b51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c822b157 fe892a0f

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
@@ -348,7 +348,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
@@ -138,7 +138,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);
@@ -155,7 +155,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,
@@ -170,7 +170,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,
@@ -185,7 +185,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
@@ -329,7 +329,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.",
@@ -358,7 +358,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
@@ -200,7 +200,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());