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

Commit a1320c0a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Pass JNIEnv explicitly into AInputQueue_fromJava"

parents 8d7fb9d8 d0c5dbab

core/jni/android_view_InputQueue.cpp

+1 −2
Original line number Diff line number Diff line
@@ -269,8 +269,7 @@ int register_android_view_InputQueue(JNIEnv* env) 
    return RegisterMethodsOrDie(env, kInputQueuePathName, g_methods, NELEM(g_methods));

}



AInputQueue* android_view_InputQueue_getNativePtr(jobject inputQueue) {

    JNIEnv* env = AndroidRuntime::getJNIEnv();

AInputQueue* android_view_InputQueue_getNativePtr(JNIEnv* env, jobject inputQueue) {

    jlong ptr = env->CallLongMethod(inputQueue, gInputQueueClassInfo.getNativePtr);

    return reinterpret_cast<AInputQueue*>(ptr);

}

core/jni/include/android_runtime/android_view_InputQueue.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ private: 
    Vector<key_value_pair_t<InputEvent*, bool> > mFinishedEvents;

};



extern AInputQueue* android_view_InputQueue_getNativePtr(jobject inputQueue);

extern AInputQueue* android_view_InputQueue_getNativePtr(JNIEnv* env, jobject inputQueue);



} // namespace android

native/android/input.cpp

+2 −2
Original line number Diff line number Diff line
@@ -330,6 +330,6 @@ void AInputQueue_finishEvent(AInputQueue* queue, AInputEvent* event, int handled 
    iq->finishEvent(e, handled != 0);

}



AInputQueue* AInputQueue_fromJava(jobject inputQueue) {

    return android::android_view_InputQueue_getNativePtr(inputQueue);

AInputQueue* AInputQueue_fromJava(JNIEnv* env, jobject inputQueue) {

    return android::android_view_InputQueue_getNativePtr(env, inputQueue);

}