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

Commit bcc984d3 authored by chaviw's avatar chaviw
Browse files

Call ScopedLocalFrame in JNI methods 

Objects were leaking in InputManagerService JNI since there were calls
from the native process without clearing the local reference.
Call ScopedLocalFrame before extrating the reference so the object
references get removed when the function returns.

Test: No longer leaking IWindow when opening/closing apps
Fixes: 131355264
Change-Id: Ib57398c833ba373b9c092e23bc965ed6d56c9fa5
parent 30bdc207

services/core/jni/com_android_server_input_InputManagerService.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include <android_view_PointerIcon.h>

#include <android_view_PointerIcon.h>

#include <android/graphics/GraphicsJNI.h>

#include <android/graphics/GraphicsJNI.h>





#include <nativehelper/ScopedLocalFrame.h>

#include <nativehelper/ScopedLocalRef.h>

#include <nativehelper/ScopedLocalRef.h>

#include <nativehelper/ScopedPrimitiveArray.h>

#include <nativehelper/ScopedPrimitiveArray.h>

#include <nativehelper/ScopedUtfChars.h>

#include <nativehelper/ScopedUtfChars.h>
@@ -723,6 +724,7 @@ nsecs_t NativeInputManager::notifyANR(const sp<InputApplicationHandle>& inputApp 
    ATRACE_CALL();

    ATRACE_CALL();





    JNIEnv* env = jniEnv();

    JNIEnv* env = jniEnv();

    ScopedLocalFrame localFrame(env);





    jobject tokenObj = javaObjectForIBinder(env, token);

    jobject tokenObj = javaObjectForIBinder(env, token);

    jstring reasonObj = env->NewStringUTF(reason.c_str());

    jstring reasonObj = env->NewStringUTF(reason.c_str());
@@ -735,8 +737,6 @@ nsecs_t NativeInputManager::notifyANR(const sp<InputApplicationHandle>& inputApp 
    } else {

    } else {

        assert(newTimeout >= 0);

        assert(newTimeout >= 0);

    }

    }



    env->DeleteLocalRef(reasonObj);

    return newTimeout;

    return newTimeout;

}

}
@@ -747,6 +747,7 @@ void NativeInputManager::notifyInputChannelBroken(const sp<IBinder>& token) { 
    ATRACE_CALL();

    ATRACE_CALL();





    JNIEnv* env = jniEnv();

    JNIEnv* env = jniEnv();

    ScopedLocalFrame localFrame(env);





    jobject tokenObj = javaObjectForIBinder(env, token);

    jobject tokenObj = javaObjectForIBinder(env, token);

    if (tokenObj) {

    if (tokenObj) {
@@ -764,6 +765,7 @@ void NativeInputManager::notifyFocusChanged(const sp<IBinder>& oldToken, 
    ATRACE_CALL();

    ATRACE_CALL();





    JNIEnv* env = jniEnv();

    JNIEnv* env = jniEnv();

    ScopedLocalFrame localFrame(env);





    jobject oldTokenObj = javaObjectForIBinder(env, oldToken);

    jobject oldTokenObj = javaObjectForIBinder(env, oldToken);

    jobject newTokenObj = javaObjectForIBinder(env, newToken);

    jobject newTokenObj = javaObjectForIBinder(env, newToken);
@@ -1139,6 +1141,7 @@ nsecs_t NativeInputManager::interceptKeyBeforeDispatching( 
    nsecs_t result = 0;

    nsecs_t result = 0;

    if (policyFlags & POLICY_FLAG_TRUSTED) {

    if (policyFlags & POLICY_FLAG_TRUSTED) {

        JNIEnv* env = jniEnv();

        JNIEnv* env = jniEnv();

        ScopedLocalFrame localFrame(env);





        // Token may be null

        // Token may be null

        jobject tokenObj = javaObjectForIBinder(env, token);

        jobject tokenObj = javaObjectForIBinder(env, token);
@@ -1173,6 +1176,7 @@ bool NativeInputManager::dispatchUnhandledKey(const sp<IBinder>& token, 
    bool result = false;

    bool result = false;

    if (policyFlags & POLICY_FLAG_TRUSTED) {

    if (policyFlags & POLICY_FLAG_TRUSTED) {

        JNIEnv* env = jniEnv();

        JNIEnv* env = jniEnv();

        ScopedLocalFrame localFrame(env);





        // Note: tokenObj may be null.

        // Note: tokenObj may be null.

        jobject tokenObj = javaObjectForIBinder(env, token);

        jobject tokenObj = javaObjectForIBinder(env, token);
@@ -1224,6 +1228,7 @@ bool NativeInputManager::checkInjectEventsPermissionNonReentrant( 
void NativeInputManager::onPointerDownOutsideFocus(const sp<IBinder>& touchedToken) {

void NativeInputManager::onPointerDownOutsideFocus(const sp<IBinder>& touchedToken) {

    ATRACE_CALL();

    ATRACE_CALL();

    JNIEnv* env = jniEnv();

    JNIEnv* env = jniEnv();

    ScopedLocalFrame localFrame(env);





    jobject touchedTokenObj = javaObjectForIBinder(env, touchedToken);

    jobject touchedTokenObj = javaObjectForIBinder(env, touchedToken);

    env->CallVoidMethod(mServiceObj, gServiceClassInfo.onPointerDownOutsideFocus, touchedTokenObj);

    env->CallVoidMethod(mServiceObj, gServiceClassInfo.onPointerDownOutsideFocus, touchedTokenObj);