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

Commit 86dc82eb authored by chaviw's avatar chaviw
Browse files

Ensure input transactions are applied before injecting input 

Input transactions were not applied synchronously with
performSurfacePlacement. This ensures input window info is sent to
native before continuing with inject input.

Bug: 122965081
Bug: 129087315
Test: WindowFocusTests
Change-Id: I18c705b0feb292e1710f5d4b5c1e844d23b2421e
parent 6f70f014

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

+16 −2
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ final class InputMonitor { 
    // When true, need to call updateInputWindowsLw().

    private boolean mUpdateInputWindowsNeeded = true;

    private boolean mUpdateInputWindowsPending;

    private boolean mApplyImmediately;



    // Currently focused input window handle.

    private InputWindowHandle mFocusedInputWindowHandle;
@@ -151,7 +152,7 @@ final class InputMonitor { 
        mService = service;

        mDisplayContent = mService.mRoot.getDisplayContent(displayId);

        mDisplayId = displayId;

        mInputTransaction = mDisplayContent.getPendingTransaction();

        mInputTransaction = mService.mTransactionFactory.make();

        mHandler = AnimationThread.getHandler();

        mUpdateInputForAllWindowsConsumer = new UpdateInputForAllWindowsConsumer();

    }
@@ -313,6 +314,14 @@ final class InputMonitor { 
        }

    }



    void updateInputWindowsImmediately() {

        if (mUpdateInputWindowsPending) {

            mApplyImmediately = true;

            mUpdateInputWindows.run();

            mApplyImmediately = false;

        }

    }



    /* Called when the current input focus changes.

     * Layer assignment is assumed to be complete by the time this is called.

     */
@@ -427,7 +436,12 @@ final class InputMonitor { 
                wallpaperInputConsumer.show(mInputTransaction, 0);

            }



            if (mApplyImmediately) {

                mInputTransaction.apply();

            } else {

                mDisplayContent.getPendingTransaction().merge(mInputTransaction);

                mDisplayContent.scheduleAnimation();

            }



            Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);

        }

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

+6 −4
Original line number Diff line number Diff line
@@ -7528,22 +7528,24 @@ public class WindowManagerService extends IWindowManager.Stub 


    @Override

    public boolean injectInputAfterTransactionsApplied(InputEvent ev, int mode) {

        boolean shouldWaitForAnimComplete = false;

        boolean shouldWaitForAnimToComplete = false;

        if (ev instanceof KeyEvent) {

            KeyEvent keyEvent = (KeyEvent) ev;

            shouldWaitForAnimComplete = keyEvent.getSource() == InputDevice.SOURCE_MOUSE

            shouldWaitForAnimToComplete = keyEvent.getSource() == InputDevice.SOURCE_MOUSE

                    || keyEvent.getAction() == KeyEvent.ACTION_DOWN;

        } else if (ev instanceof MotionEvent) {

            MotionEvent motionEvent = (MotionEvent) ev;

            shouldWaitForAnimComplete = motionEvent.getSource() == InputDevice.SOURCE_MOUSE

            shouldWaitForAnimToComplete = motionEvent.getSource() == InputDevice.SOURCE_MOUSE

                    || motionEvent.getAction() == MotionEvent.ACTION_DOWN;

        }



        if (shouldWaitForAnimComplete) {

        if (shouldWaitForAnimToComplete) {

            waitForAnimationsToComplete();



            synchronized (mGlobalLock) {

                mWindowPlacerLocked.performSurfacePlacementIfScheduled();

                mRoot.forAllDisplays(displayContent ->

                        displayContent.getInputMonitor().updateInputWindowsImmediately());

            }



            new SurfaceControl.Transaction().syncInputWindows().apply(true);