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

Commit a358e8c9 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add ScopedLocalRef for javaObjectForIBinder"" into tm-dev

parents f6da6420 c1442691

core/jni/android_hardware_input_InputApplicationHandle.cpp

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


jobject android_view_InputApplicationHandle_fromInputApplicationInfo(

        JNIEnv* env, gui::InputApplicationInfo inputApplicationInfo) {

    ScopedLocalRef<jobject> binderObject(env,

                                         javaObjectForIBinder(env, inputApplicationInfo.token));

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

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

    return env->NewObject(gInputApplicationHandleClassInfo.clazz,

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

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

                          inputApplicationInfo.dispatchingTimeoutMillis);

}

core/jni/android_hardware_input_InputWindowHandle.cpp

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

    LOG_ALWAYS_FATAL_IF(inputWindowHandle == nullptr,

                        "Failed to create new InputWindowHandle object.");

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

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

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.token,

                        javaObjectForIBinder(env, windowInfo.token));

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

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

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

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



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

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.windowToken,

                        windowToken.get());

                        javaObjectForIBinder(env, windowInfo.windowToken));



    return inputWindowHandle;

}