drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chavi Weingarten 2022-04-01 21:18:56 +00:00 committed by Android (Google) Code Review
commit fc5865f69f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_window_WindowInfosListener.cpp
View File

@ -22,6 +22,7 @@
#include <gui/DisplayInfo.h> #include <gui/DisplayInfo.h>
#include <gui/SurfaceComposerClient.h> #include <gui/SurfaceComposerClient.h>
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIHelp.h>
#include <nativehelper/ScopedLocalFrame.h>
#include <utils/Log.h> #include <utils/Log.h>
#include "android_hardware_input_InputWindowHandle.h" #include "android_hardware_input_InputWindowHandle.h"
@ -95,6 +96,7 @@ struct WindowInfosListener : public gui::WindowInfosListener {
JNIEnv* env = AndroidRuntime::getJNIEnv(); JNIEnv* env = AndroidRuntime::getJNIEnv();
LOG_ALWAYS_FATAL_IF(env == nullptr, "Unable to retrieve JNIEnv in onWindowInfoChanged."); LOG_ALWAYS_FATAL_IF(env == nullptr, "Unable to retrieve JNIEnv in onWindowInfoChanged.");
ScopedLocalFrame localFrame(env);
jobject listener = env->NewGlobalRef(mListener); jobject listener = env->NewGlobalRef(mListener);
if (listener == nullptr) { if (listener == nullptr) {
// Weak reference went out of scope // Weak reference went out of scope