Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Riddle Hsu
2020-11-19 15:24:27 +00:00
committed by Android (Google) Code Review
parent 6b4185abd1 275aba2deb
commit 7585f8c448
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -994,9 +994,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
} }
} }
// Remove all deferred displays stacks, tasks, and activities.
handleCompleteDeferredRemoval();
forAllDisplays(dc -> { forAllDisplays(dc -> {
dc.getInputMonitor().updateInputWindowsLw(true /*force*/); dc.getInputMonitor().updateInputWindowsLw(true /*force*/);
dc.updateSystemGestureExclusion(); dc.updateSystemGestureExclusion();

3
services/core/java/com/android/server/wm/WindowAnimator.java
View File

@@ -143,6 +143,9 @@ public class WindowAnimator {
ProtoLog.i(WM_SHOW_TRANSACTIONS, ">>> OPEN TRANSACTION animate"); ProtoLog.i(WM_SHOW_TRANSACTIONS, ">>> OPEN TRANSACTION animate");
mService.openSurfaceTransaction(); mService.openSurfaceTransaction();
try { try {
// Remove all deferred displays, tasks, and activities.
mService.mRoot.handleCompleteDeferredRemoval();
final AccessibilityController accessibilityController = final AccessibilityController accessibilityController =
mService.mAccessibilityController; mService.mAccessibilityController;
final int numDisplays = mDisplayContentsAnimators.size(); final int numDisplays = mDisplayContentsAnimators.size();

2
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -1060,7 +1060,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
// descendant. E.g. if a display is pending to be removed because it contains an // 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 // activity with {@link ActivityRecord#mIsExiting} is true, the display may be
// removed when completing the removal of the last activity from // removed when completing the removal of the last activity from
// {@link ActivityRecord#checkCompleteDeferredRemoval}. // {@link ActivityRecord#handleCompleteDeferredRemoval}.
return false; return false;
} }
} }