drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Window manager: cancel animations before losing references to them.

Browse Source 
For possible future changes to android.view.animation.Animation to tie
into StrictMode's animation annotations on violations.

Change-Id: I3a23fa9bd5edb0500586bb0e341f83f998b28ae7
This commit is contained in:
Brad Fitzpatrick
2010-11-03 11:46:54 -07:00
parent d57c14f95e
commit 3fe3851753
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/java/com/android/server/WindowManagerService.java
View File

@ -2736,7 +2736,10 @@ public class WindowManagerService extends IWindowManager.Stub
displayed = !win.isVisibleLw();
if (win.mExiting) {
win.mExiting = false;
win.mAnimation = null;
if (win.mAnimation != null) {
win.mAnimation.cancel();
win.mAnimation = null;
}
}
if (win.mDestroying) {
win.mDestroying = false;
@ -6903,6 +6906,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (mAnimation != null) {
mAnimating = true;
mLocalAnimating = false;
mAnimation.cancel();
mAnimation = null;
}
}
@ -7174,6 +7178,7 @@ public class WindowManagerService extends IWindowManager.Stub
// starting window, so there is no need for it to also
// be doing its own stuff.
if (mAnimation != null) {
mAnimation.cancel();
mAnimation = null;
// Make sure we clean up the animation.
mAnimating = true;
@ -7219,7 +7224,11 @@ public class WindowManagerService extends IWindowManager.Stub
if (DEBUG_ANIM) Slog.v(
TAG, "Finished animation in " + this +
" @ " + currentTime);
mAnimation = null;
if (mAnimation != null) {
mAnimation.cancel();
mAnimation = null;
}
//WindowManagerService.this.dump();
}
mHasLocalTransformation = false;
@ -7248,6 +7257,7 @@ public class WindowManagerService extends IWindowManager.Stub
// clear it and make sure we run the cleanup code.
mAnimating = true;
mLocalAnimating = true;
mAnimation.cancel();
mAnimation = null;
}
@ -7262,7 +7272,10 @@ public class WindowManagerService extends IWindowManager.Stub
mAnimating = false;
mLocalAnimating = false;
mAnimation = null;
if (mAnimation != null) {
mAnimation.cancel();
mAnimation = null;
}
mAnimLayer = mLayer;
if (mIsImWindow) {
mAnimLayer += mInputMethodAnimLayerAdjustment;