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

Merge "Fix crash while animating removed stack" into qt-dev am: f8b534a834

Browse Source 
am: 7216f80e55

Change-Id: I95f2933d8d13619d966ee116e1aae4812fd8805f
This commit is contained in:
Winson Chung
2019-06-25 22:32:16 -07:00
committed by android-build-merger
parent 69a6d33c3f 7216f80e55
commit 0282a44537
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1936,8 +1936,12 @@ public class TaskStack extends WindowContainer<Task> implements
public boolean setPinnedStackAlpha(float alpha) { public boolean setPinnedStackAlpha(float alpha) {
// Hold the lock since this is called from the BoundsAnimator running on the UiThread // Hold the lock since this is called from the BoundsAnimator running on the UiThread
synchronized (mWmService.mGlobalLock) { synchronized (mWmService.mGlobalLock) {
getPendingTransaction().setAlpha(getSurfaceControl(), final SurfaceControl sc = getSurfaceControl();
mCancelCurrentBoundsAnimation ? 1 : alpha); if (sc == null || !sc.isValid()) {
// If the stack is already removed, don't bother updating any stack animation
return false;
}
getPendingTransaction().setAlpha(sc, mCancelCurrentBoundsAnimation ? 1 : alpha);
scheduleAnimation(); scheduleAnimation();
return !mCancelCurrentBoundsAnimation; return !mCancelCurrentBoundsAnimation;
} }