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

Commit c275c2d3 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Move handleCompleteDeferredRemoval to animator thread" into rvc-qpr-dev... 

Merge "Move handleCompleteDeferredRemoval to animator thread" into rvc-qpr-dev am: 7585f8c4 am: 3c34bff2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13087901

Change-Id: Ie52c63d4ba4b5e546b6af73fab18f01877e5413e
parents 8faa09f6 3c34bff2

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

+0 −3
Original line number Diff line number Diff line
@@ -998,9 +998,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            }

        }



        // Remove all deferred displays stacks, tasks, and activities.

        handleCompleteDeferredRemoval();



        forAllDisplays(dc -> {

            dc.getInputMonitor().updateInputWindowsLw(true /*force*/);

            dc.updateSystemGestureExclusion();

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

+3 −0
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ public class WindowAnimator { 
        ProtoLog.i(WM_SHOW_TRANSACTIONS, ">>> OPEN TRANSACTION animate");

        mService.openSurfaceTransaction();

        try {

            // Remove all deferred displays, tasks, and activities.

            mService.mRoot.handleCompleteDeferredRemoval();



            final AccessibilityController accessibilityController =

                    mService.mAccessibilityController;

            final int numDisplays = mDisplayContentsAnimators.size();

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

+1 −1
Original line number Diff line number Diff line
@@ -1112,7 +1112,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
                // descendant. E.g. if a display is pending to be removed because it contains an

                // activity with {@link ActivityRecord#mIsExiting} is true, the display may be

                // removed when completing the removal of the last activity from

                // {@link ActivityRecord#checkCompleteDeferredRemoval}.

                // {@link ActivityRecord#handleCompleteDeferredRemoval}.

                return false;

            }

        }