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

Commit da00bcd4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use InputChannel::create"

parents 3751c44d 7ffc8e93
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -210,8 +210,7 @@ static void android_view_InputChannel_nativeReadFromParcel(JNIEnv* env, jobject
    if (parcel) {
        bool isInitialized = parcel->readInt32();
        if (isInitialized) {
            InputChannel* inputChannel = new InputChannel();
            inputChannel->read(*parcel);
            sp<InputChannel> inputChannel = InputChannel::read(*parcel);

            NativeInputChannel* nativeInputChannel = new NativeInputChannel(inputChannel);

+2 −3
Original line number Diff line number Diff line
@@ -7717,8 +7717,7 @@ public class WindowManagerService extends IWindowManager.Stub
        clientChannel.transferTo(outInputChannel);
        clientChannel.dispose();

        IBinder token = new Binder();
        mInputManager.registerInputChannel(inputChannel, token);
        mInputManager.registerInputChannel(inputChannel, null /* generate new token */);

        // Prevent the java finalizer from breaking the input channel. But we won't
        // do any further management so we just release the java ref and let the
@@ -7726,7 +7725,7 @@ public class WindowManagerService extends IWindowManager.Stub
        inputChannel.release();

        InputWindowHandle h = new InputWindowHandle(null, null, displayId);
        h.token = token;
        h.token = inputChannel.getToken();
        h.name = name;
        h.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
        h.layoutParamsType = 0;