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

Commit 96f4a2af authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Add isClone to InputWindowHandle" into tm-dev

parents 811e3c9d 1dc168ad

core/java/android/view/InputWindowHandle.java

+5 −0
Original line number Diff line number Diff line
@@ -157,6 +157,11 @@ public final class InputWindowHandle { 
     */

    public Matrix transform;



    /**

     * Whether this window is a clone or the original window.

     */

    public boolean isClone;



    private native void nativeDispose();



    public InputWindowHandle(InputApplicationHandle inputApplicationHandle, int displayId) {

core/jni/android_hardware_input_InputWindowHandle.cpp

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static struct { 
    WeakRefHandleField touchableRegionSurfaceControl;

    jfieldID transform;

    jfieldID windowToken;

    jfieldID isClone;

} gInputWindowHandleClassInfo;



static struct {
@@ -317,6 +318,8 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn 
    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.windowToken,

                        javaObjectForIBinder(env, windowInfo.windowToken));



    env->SetBooleanField(inputWindowHandle, gInputWindowHandleClassInfo.isClone,

                         windowInfo.isClone);

    return inputWindowHandle;

}
@@ -433,6 +436,8 @@ int register_android_view_InputWindowHandle(JNIEnv* env) { 
    GET_FIELD_ID(gInputWindowHandleClassInfo.windowToken, clazz, "windowToken",

                 "Landroid/os/IBinder;");



    GET_FIELD_ID(gInputWindowHandleClassInfo.isClone, clazz, "isClone", "Z");



    jclass weakRefClazz;

    FIND_CLASS(weakRefClazz, "java/lang/ref/Reference");