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

Commit fc5865f6 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Add ScopedLocalFrame in functions that hold Java objects" into tm-dev

parents 2dcae951 5e70aa55

core/jni/android_window_WindowInfosListener.cpp

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <gui/DisplayInfo.h>

#include <gui/SurfaceComposerClient.h>

#include <nativehelper/JNIHelp.h>

#include <nativehelper/ScopedLocalFrame.h>

#include <utils/Log.h>



#include "android_hardware_input_InputWindowHandle.h"
@@ -95,6 +96,7 @@ struct WindowInfosListener : public gui::WindowInfosListener { 
        JNIEnv* env = AndroidRuntime::getJNIEnv();

        LOG_ALWAYS_FATAL_IF(env == nullptr, "Unable to retrieve JNIEnv in onWindowInfoChanged.");



        ScopedLocalFrame localFrame(env);

        jobject listener = env->NewGlobalRef(mListener);

        if (listener == nullptr) {

            // Weak reference went out of scope