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

Commit acf11408 authored by Chong Zhang's avatar Chong Zhang
Browse files

Discard input events sent to dead window 

And add a check to skip repositioning if window doesn't have a
valid input channel.

bug: 25345787
Change-Id: I555eb9a2ce258d77cd69c53c323dc3db646c773f
parent d5647923

services/core/java/com/android/server/wm/WindowManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -7081,6 +7081,11 @@ public class WindowManagerService extends IWindowManager.Stub 
            Slog.w(TAG, "startPositioningLocked: Bad window " + win);

            return false;

        }

        if (win.mInputChannel == null) {

            Slog.wtf(TAG, "startPositioningLocked: " + win + " has no input channel, "

                    + " probably being removed");

            return false;

        }



        final DisplayContent displayContent = win.getDisplayContent();

        if (displayContent == null) {

services/core/java/com/android/server/wm/WindowState.java

+30 −5
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ import android.view.Gravity; 
import android.view.IApplicationToken;

import android.view.IWindow;

import android.view.InputChannel;

import android.view.InputEvent;

import android.view.InputEventReceiver;

import android.view.View;

import android.view.ViewTreeObserver;

import android.view.WindowManager;
@@ -1282,6 +1284,20 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
        mConfigHasChanged = false;

    }



    private final class DeadWindowEventReceiver extends InputEventReceiver {

        DeadWindowEventReceiver(InputChannel inputChannel) {

            super(inputChannel, mService.mH.getLooper());

        }

        @Override

        public void onInputEvent(InputEvent event) {

            finishInputEvent(event, true);

        }

    }

    /**

     *  Dummy event receiver for windows that died visible.

     */

    private DeadWindowEventReceiver mDeadWindowEventReceiver;



    void openInputChannel(InputChannel outInputChannel) {

        if (mInputChannel != null) {

            throw new IllegalStateException("Window already has an input channel.");
@@ -1295,22 +1311,31 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
            mClientChannel.transferTo(outInputChannel);

            mClientChannel.dispose();

            mClientChannel = null;

        } else {

            // If the window died visible, we setup a dummy input channel, so that taps

            // can still detected by input monitor channel, and we can relaunch the app.

            // Create dummy event receiver that simply reports all events as handled.

            mDeadWindowEventReceiver = new DeadWindowEventReceiver(mClientChannel);

        }

        mService.mInputManager.registerInputChannel(mInputChannel, mInputWindowHandle);

    }



    void disposeInputChannel() {

        if (mClientChannel != null) {

            mClientChannel.dispose();

            mClientChannel = null;

        if (mDeadWindowEventReceiver != null) {

            mDeadWindowEventReceiver.dispose();

            mDeadWindowEventReceiver = null;

        }



        // unregister server channel first otherwise it complains about broken channel

        if (mInputChannel != null) {

            mService.mInputManager.unregisterInputChannel(mInputChannel);



            mInputChannel.dispose();

            mInputChannel = null;

        }



        if (mClientChannel != null) {

            mClientChannel.dispose();

            mClientChannel = null;

        }

        mInputWindowHandle.inputChannel = null;

    }