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

Commit 9a23a72a 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: I15a1885655e691601b696a27e8a62d3b5900f108
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f561aadc 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