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

Commit eda73ff2 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

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

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



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

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