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

Commit d5909d00 authored by wilsonshih's avatar wilsonshih
Browse files

Pausing app surface to receive touch during predictive back animation. 

App can trigger an unexpected transition due to receive touch event
on it's surface, core isn't able to detect what could happen from that
touch and thus unable to polish the transition. So before app's
onBackInvoked callback being called, disallow the app from receive
touch event, until the close transition is ready.

Bug: 308395772
Test: tried on cross-activity/cross-task/back-to-home animation that
the touch event on animation targets during animation will be ignored.
Test: verify won't affect multiple gesture ag/25007350.

Change-Id: Icbd099d8ea90e9ba3e300c8c297961e1cd518245
parent c39ad36c

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

+7 −0
Original line number Diff line number Diff line
@@ -811,6 +811,13 @@ class BackNavigationController { 
        return mAnimationHandler.isTarget(wc, wc.isVisibleRequested() /* open */);

    }



    boolean shouldPauseTouch(WindowContainer wc) {

        // Once the close transition is ready, it means the onBackInvoked callback has invoked, and

        // app is ready to trigger next transition, no matter what it will be.

        return mAnimationHandler.mComposed && mWaitTransitionFinish == null

                && mAnimationHandler.isTarget(wc, wc.isVisibleRequested() /* open */);

    }



    /**

     * Cleanup animation, this can either happen when legacy transition ready, or when the Shell

     * transition finish.

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

+5 −0
Original line number Diff line number Diff line
@@ -2974,6 +2974,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            return true;

        }



        // Do not allow back predictive animation target to receive touch, app can trigger an

        // unexpected transition so basically unable to polish it.

        if (mWmService.mAtmService.mBackNavigationController.shouldPauseTouch(mActivityRecord)) {

            return false;

        }

        return !mActivityRecord.getTask().getRootTask().shouldIgnoreInput()

                && mActivityRecord.isVisibleRequested();

    }