Merge "Release SurfaceControl after creating an input channel" into main

    jmethodID removeInputChannel;

} gWindowManagerGlobal;

static struct {

    jclass clazz;

    jmethodID release;

} gSurfaceControl;

std::shared_ptr<InputChannel> createInputChannel(

        const sp<IBinder>& clientToken, const InputTransferToken& hostInputTransferToken,

        const SurfaceControl& surfaceControl, const InputTransferToken& clientInputTransferToken) {

                                                        surfaceControlObj.get(),

                                                        clientInputTransferTokenObj.get()));

    env->CallVoidMethod(surfaceControlObj.get(), gSurfaceControl.release);

    return android_view_InputChannel_getInputChannel(env, inputChannelObj.get());

}

            GetStaticMethodIDOrDie(env, windowManagerGlobalClass, "removeInputChannel",

                                   "(Landroid/os/IBinder;)V");

    jclass surfaceControlClass = FindClassOrDie(env, "android/view/SurfaceControl");

    gSurfaceControl.clazz = MakeGlobalRefOrDie(env, surfaceControlClass);

    gSurfaceControl.release = GetMethodIDOrDie(env, gSurfaceControl.clazz, "release", "()V");

    return NO_ERROR;

}