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

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

Merge "Add ScopedLocalRef for javaObjectForIBinder" into tm-dev am: 29ffb6ba 

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



Change-Id: Ie44deaaaba0256fcdc8ca9700c595b7b839be7ac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2673d4ed 29ffb6ba

core/jni/android_hardware_input_InputApplicationHandle.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -105,10 +105,11 @@ std::shared_ptr<InputApplicationHandle> android_view_InputApplicationHandle_getH 




jobject android_view_InputApplicationHandle_fromInputApplicationInfo(

jobject android_view_InputApplicationHandle_fromInputApplicationInfo(

        JNIEnv* env, gui::InputApplicationInfo inputApplicationInfo) {

        JNIEnv* env, gui::InputApplicationInfo inputApplicationInfo) {

    jobject binderObject = javaObjectForIBinder(env, inputApplicationInfo.token);

    ScopedLocalRef<jobject> binderObject(env,

                                         javaObjectForIBinder(env, inputApplicationInfo.token));

    ScopedLocalRef<jstring> name(env, env->NewStringUTF(inputApplicationInfo.name.data()));

    ScopedLocalRef<jstring> name(env, env->NewStringUTF(inputApplicationInfo.name.data()));

    return env->NewObject(gInputApplicationHandleClassInfo.clazz,

    return env->NewObject(gInputApplicationHandleClassInfo.clazz,

                          gInputApplicationHandleClassInfo.ctor, binderObject, name.get(),

                          gInputApplicationHandleClassInfo.ctor, binderObject.get(), name.get(),

                          inputApplicationInfo.dispatchingTimeoutMillis);

                          inputApplicationInfo.dispatchingTimeoutMillis);

}

}

core/jni/android_hardware_input_InputWindowHandle.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -261,8 +261,8 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn 
    }

    }

    LOG_ALWAYS_FATAL_IF(inputWindowHandle == nullptr,

    LOG_ALWAYS_FATAL_IF(inputWindowHandle == nullptr,

                        "Failed to create new InputWindowHandle object.");

                        "Failed to create new InputWindowHandle object.");

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.token,

    ScopedLocalRef<jobject> token(env, javaObjectForIBinder(env, windowInfo.token));

                        javaObjectForIBinder(env, windowInfo.token));

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.token, token.get());

    ScopedLocalRef<jstring> name(env, env->NewStringUTF(windowInfo.name.data()));

    ScopedLocalRef<jstring> name(env, env->NewStringUTF(windowInfo.name.data()));

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.name, name.get());

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.name, name.get());

    env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.layoutParamsFlags,

    env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.layoutParamsFlags,
@@ -317,8 +317,9 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn 
    ScopedLocalRef<jobject> matrixObj(env, AMatrix_newInstance(env, transformVals));

    ScopedLocalRef<jobject> matrixObj(env, AMatrix_newInstance(env, transformVals));

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.transform, matrixObj.get());

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.transform, matrixObj.get());





    ScopedLocalRef<jobject> windowToken(env, javaObjectForIBinder(env, windowInfo.windowToken));

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.windowToken,

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.windowToken,

                        javaObjectForIBinder(env, windowInfo.windowToken));

                        windowToken.get());





    return inputWindowHandle;

    return inputWindowHandle;

}

}