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

Commit db111ee2 authored by Winson Chung's avatar Winson Chung
Browse files

Allow recents animation controller to control input consumer lifecycle 

- Removing race between the system cleaning up the input consumer and the
  controller who is also managing the input consumer lifecycle (it's
  preferable for the controller to keep the input consumer registered,
  and only to toggle the enabled state).  Instead, we only ensure that we
  clean up if the runner is unexpected destroyed.
- Also ensure that we don't add the input consumer on top of the runner's
  app window

Bug: 117224991
Test: atest FrameworksServicesTests:RecentsAnimationTest
Test: atest FrameworksServicesTests:com.android.server.wm.RecentsAnimationControllerTest

Change-Id: I258f655417220b95112ba784e2ab2f30a9ee2a4a
parent e5bc538a

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -435,14 +435,14 @@ final class InputMonitor { 
                final RecentsAnimationController recentsAnimationController =

                final RecentsAnimationController recentsAnimationController =

                        mService.getRecentsAnimationController();

                        mService.getRecentsAnimationController();

                if (recentsAnimationController != null

                if (recentsAnimationController != null

                        && recentsAnimationController.hasInputConsumerForApp(w.mAppToken)) {

                        && recentsAnimationController.shouldApplyInputConsumer(w.mAppToken)) {

                    if (recentsAnimationController.updateInputConsumerForApp(

                    if (recentsAnimationController.updateInputConsumerForApp(

                            recentsAnimationInputConsumer.mWindowHandle, hasFocus)) {

                            recentsAnimationInputConsumer.mWindowHandle, hasFocus)) {

                        addInputWindowHandle(recentsAnimationInputConsumer.mWindowHandle);

                        addInputWindowHandle(recentsAnimationInputConsumer.mWindowHandle);

                        mAddRecentsAnimationInputConsumerHandle = false;

                        mAddRecentsAnimationInputConsumerHandle = false;

                    }

                    }

                    // Skip adding the window below regardless of whether there is an input consumer

                    // If the target app window does not yet exist, then we don't add the input

                    // to handle it

                    // consumer window, but also don't add the app window below.

                    return;

                    return;

                }

                }

            }

            }

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

+15 −4
Original line number Original line Diff line number Diff line
@@ -458,10 +458,9 @@ public class RecentsAnimationController implements DeathRecipient { 
        mRunner = null;

        mRunner = null;

        mCanceled = true;

        mCanceled = true;





        // Clear associated input consumers

        // Update the input windows after the animation is complete

        final InputMonitor inputMonitor =

        final InputMonitor inputMonitor =

                mService.mRoot.getDisplayContent(mDisplayId).getInputMonitor();

                mService.mRoot.getDisplayContent(mDisplayId).getInputMonitor();

        inputMonitor.destroyInputConsumer(INPUT_CONSUMER_RECENTS_ANIMATION);

        inputMonitor.updateInputWindowsLw(true /*force*/);

        inputMonitor.updateInputWindowsLw(true /*force*/);





        // We have deferred all notifications to the target app as a part of the recents animation,

        // We have deferred all notifications to the target app as a part of the recents animation,
@@ -494,6 +493,11 @@ public class RecentsAnimationController implements DeathRecipient { 
    @Override

    @Override

    public void binderDied() {

    public void binderDied() {

        cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "binderDied");

        cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION, "binderDied");



        // Clear associated input consumers on runner death

        final InputMonitor inputMonitor =

                mService.mRoot.getDisplayContent(mDisplayId).getInputMonitor();

        inputMonitor.destroyInputConsumer(INPUT_CONSUMER_RECENTS_ANIMATION);

    }

    }





    void checkAnimationReady(WallpaperController wallpaperController) {

    void checkAnimationReady(WallpaperController wallpaperController) {
@@ -516,8 +520,14 @@ public class RecentsAnimationController implements DeathRecipient { 
                && isTargetOverWallpaper();

                && isTargetOverWallpaper();

    }

    }





    boolean hasInputConsumerForApp(AppWindowToken appToken) {

    /**

        return mInputConsumerEnabled && isAnimatingApp(appToken);

     * @return Whether to use the input consumer to override app input to route home/recents.

     */

    boolean shouldApplyInputConsumer(AppWindowToken appToken) {

        // Only apply the input consumer if it is enabled, it is not the target (home/recents)

        // being revealed with the transition, and we are actively animating the app as a part of

        // the animation

        return mInputConsumerEnabled && mTargetAppToken != appToken && isAnimatingApp(appToken);

    }

    }





    boolean updateInputConsumerForApp(InputWindowHandle inputWindowHandle,

    boolean updateInputConsumerForApp(InputWindowHandle inputWindowHandle,
@@ -675,6 +685,7 @@ public class RecentsAnimationController implements DeathRecipient { 
        final String innerPrefix = prefix + "  ";

        final String innerPrefix = prefix + "  ";

        pw.print(prefix); pw.println(RecentsAnimationController.class.getSimpleName() + ":");

        pw.print(prefix); pw.println(RecentsAnimationController.class.getSimpleName() + ":");

        pw.print(innerPrefix); pw.println("mPendingStart=" + mPendingStart);

        pw.print(innerPrefix); pw.println("mPendingStart=" + mPendingStart);

        pw.print(innerPrefix); pw.println("mPendingAnimations=" + mPendingAnimations.size());

        pw.print(innerPrefix); pw.println("mCanceled=" + mCanceled);

        pw.print(innerPrefix); pw.println("mCanceled=" + mCanceled);

        pw.print(innerPrefix); pw.println("mInputConsumerEnabled=" + mInputConsumerEnabled);

        pw.print(innerPrefix); pw.println("mInputConsumerEnabled=" + mInputConsumerEnabled);

        pw.print(innerPrefix); pw.println("mSplitScreenMinimized=" + mSplitScreenMinimized);

        pw.print(innerPrefix); pw.println("mSplitScreenMinimized=" + mSplitScreenMinimized);

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -2685,8 +2685,9 @@ public class WindowManagerService extends IWindowManager.Stub 
    public void cleanupRecentsAnimation(@RecentsAnimationController.ReorderMode int reorderMode) {

    public void cleanupRecentsAnimation(@RecentsAnimationController.ReorderMode int reorderMode) {

        synchronized (mWindowMap) {

        synchronized (mWindowMap) {

            if (mRecentsAnimationController != null) {

            if (mRecentsAnimationController != null) {

                mRecentsAnimationController.cleanupAnimation(reorderMode);

                final RecentsAnimationController controller = mRecentsAnimationController;

                mRecentsAnimationController = null;

                mRecentsAnimationController = null;

                controller.cleanupAnimation(reorderMode);

                mAppTransition.updateBooster();

                mAppTransition.updateBooster();

            }

            }

        }

        }