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

Merge "Remove unnecessary clean up of targets" into sc-v2-dev

Browse Source
This commit is contained in:
Winson Chung
2021-12-10 17:59:52 +00:00
committed by Android (Google) Code Review
parent bf4096c6f9 04728f77d7
commit e59a4fee55
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/RecentsAnimationController.java
View File

@@ -264,13 +264,6 @@ public class RecentsAnimationController implements DeathRecipient {
"finish(%b): mCanceled=%b", moveHomeToTop, mCanceled); "finish(%b): mCanceled=%b", moveHomeToTop, mCanceled);
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
synchronized (mService.getWindowManagerLock()) {
// Remove all new task targets.
for (int i = mPendingNewTaskTargets.size() - 1; i >= 0; i--) {
removeTaskInternal(mPendingNewTaskTargets.get(i));
}
}
// Note, the callback will handle its own synchronization, do not lock on WM lock // Note, the callback will handle its own synchronization, do not lock on WM lock
// prior to calling the callback // prior to calling the callback
mCallbacks.onAnimationFinished(moveHomeToTop mCallbacks.onAnimationFinished(moveHomeToTop
@@ -760,7 +753,7 @@ public class RecentsAnimationController implements DeathRecipient {
// the task-id with the leaf id. // the task-id with the leaf id.
final Task leafTask = task.getTopLeafTask(); final Task leafTask = task.getTopLeafTask();
int taskId = leafTask.mTaskId; int taskId = leafTask.mTaskId;
TaskAnimationAdapter adapter = (TaskAnimationAdapter) addAnimation(task, TaskAnimationAdapter adapter = addAnimation(task,
!recentTaskIds.get(taskId), true /* hidden */, finishedCallback); !recentTaskIds.get(taskId), true /* hidden */, finishedCallback);
mPendingNewTaskTargets.add(taskId); mPendingNewTaskTargets.add(taskId);
return adapter.createRemoteAnimationTarget(taskId); return adapter.createRemoteAnimationTarget(taskId);
@@ -1013,6 +1006,7 @@ public class RecentsAnimationController implements DeathRecipient {
taskAdapter.onCleanup(); taskAdapter.onCleanup();
} }
// Should already be empty, but clean-up pending task-appears in-case they weren't sent. // Should already be empty, but clean-up pending task-appears in-case they weren't sent.
mPendingNewTaskTargets.clear();
mPendingTaskAppears.clear(); mPendingTaskAppears.clear();
for (int i = mPendingWallpaperAnimations.size() - 1; i >= 0; i--) { for (int i = mPendingWallpaperAnimations.size() - 1; i >= 0; i--) {