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

Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev

Browse Source 
am: 7925f817d0

Change-Id: I0b957a0a67a9e245d51dce610acef97d6b72fa04
This commit is contained in:
Wale Ogunwale
2017-06-07 13:50:25 +00:00
committed by android-build-merger
parent 38568aff22 7925f817d0
commit ffbef55373
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/TaskStack.java
View File

@@ -109,6 +109,7 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye
/** Application tokens that are exiting, but still on screen for animations. */ /** Application tokens that are exiting, but still on screen for animations. */
final AppTokenList mExitingAppTokens = new AppTokenList(); final AppTokenList mExitingAppTokens = new AppTokenList();
final AppTokenList mTmpAppTokens = new AppTokenList();
/** Detach this stack from its display when animation completes. */ /** Detach this stack from its display when animation completes. */
// TODO: maybe tie this to WindowContainer#removeChild some how... // TODO: maybe tie this to WindowContainer#removeChild some how...
@@ -1626,9 +1627,14 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye
// TODO: Why aren't we just using the loop above for this? mAppAnimator.animating isn't set // TODO: Why aren't we just using the loop above for this? mAppAnimator.animating isn't set
// below but is set in the loop above. See if it really matters... // below but is set in the loop above. See if it really matters...
final int exitingCount = mExitingAppTokens.size();
for (int i = 0; i < exitingCount; i++) { // Clear before using.
final AppWindowAnimator appAnimator = mExitingAppTokens.get(i).mAppAnimator; mTmpAppTokens.clear();
// We copy the list as things can be removed from the exiting token list while we are
// processing.
mTmpAppTokens.addAll(mExitingAppTokens);
for (int i = 0; i < mTmpAppTokens.size(); i++) {
final AppWindowAnimator appAnimator = mTmpAppTokens.get(i).mAppAnimator;
appAnimator.wasAnimating = appAnimator.animating; appAnimator.wasAnimating = appAnimator.animating;
if (appAnimator.stepAnimationLocked(currentTime)) { if (appAnimator.stepAnimationLocked(currentTime)) {
mService.mAnimator.setAnimating(true); mService.mAnimator.setAnimating(true);
@@ -1641,6 +1647,8 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye
"updateWindowsApps...: done animating exiting " + appAnimator.mAppToken); "updateWindowsApps...: done animating exiting " + appAnimator.mAppToken);
} }
} }
// Clear to avoid holding reference to tokens.
mTmpAppTokens.clear();
} }
@Override @Override