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

Merge "Check nullity of finished callback"

Browse Source
This commit is contained in:
Vadim Caen
2019-09-19 09:29:47 +00:00
committed by Android (Google) Code Review
parent b74b62d549 9745f97572
commit a4e35ce861
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/SurfaceAnimator.java
View File

@@ -54,6 +54,7 @@ class SurfaceAnimator {
final Animatable mAnimatable;
private final OnAnimationFinishedCallback mInnerAnimationFinishedCallback;
@VisibleForTesting
@Nullable
final Runnable mAnimationFinishedCallback;
private boolean mAnimationStartDelayed;
@@ -262,7 +263,7 @@ class SurfaceAnimator {
if (!mAnimationStartDelayed && forwardCancel) {
animation.onAnimationCancelled(leash);
}
if (!restarting) {
if (!restarting && mAnimationFinishedCallback != null) {
mAnimationFinishedCallback.run();
}
}

13
services/tests/wmtests/src/com/android/server/wm/SurfaceAnimatorTest.java
View File

@@ -137,6 +137,19 @@ public class SurfaceAnimatorTest extends WindowTestsBase {
verify(mTransaction).remove(eq(mAnimatable.mLeash));
}
@Test
public void testCancelWithNullFinishCallbackAnimation() {
SurfaceAnimator animator = new SurfaceAnimator(mAnimatable, null, mWm);
animator.startAnimation(mTransaction, mSpec, true /* hidden */);
assertTrue(animator.isAnimating());
assertNotNull(animator.getAnimation());
animator.cancelAnimation();
assertFalse(animator.isAnimating());
assertNull(animator.getAnimation());
verify(mSpec).onAnimationCancelled(any());
verify(mTransaction).remove(eq(mAnimatable.mLeash));
}
@Test
public void testDelayingAnimationStart() {
mAnimatable.mSurfaceAnimator.startDelayingAnimationStart();