Skip to content

Commit 5785e05

Browse files
Craig MautnerAndroid (Google) Code Review
authored andcommitted
Merge "Clear sendingToBottom when animation is complete." into jb-dev
2 parents c258546 + 3f99fde commit 5785e05

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8257,6 +8257,9 @@ private int handleAnimatingStoppedAndTransitionLocked() {
82578257

82588258
mAppTransitionRunning = false;
82598259
// Restore window app tokens to the ActivityManager views
8260+
for (int i = mAnimatingAppTokens.size() - 1; i >= 0; i--) {
8261+
mAnimatingAppTokens.get(i).sendingToBottom = false;
8262+
}
82608263
mAnimatingAppTokens.clear();
82618264
mAnimatingAppTokens.addAll(mAppTokens);
82628265
rebuildAppWindowListLocked();
@@ -9120,6 +9123,8 @@ private WindowState computeFocusedWindowLocked() {
91209123

91219124
// If this window's application has been removed, just skip it.
91229125
if (thisApp != null && (thisApp.removed || thisApp.sendingToBottom)) {
9126+
if (DEBUG_FOCUS) Slog.v(TAG, "Skipping app because " + (thisApp.removed
9127+
? "removed" : "sendingToBottom"));
91239128
continue;
91249129
}
91259130

0 commit comments

Comments
 (0)