am bdb86ffb: am 46e581fa: Make sure to clear PulseAnimation correctly in InCallActivity

* commit 'bdb86ffb62b3fd8ab8f5447217f27b21c0f15468':
  Make sure to clear PulseAnimation correctly in InCallActivity

1 files changed, 3 insertions, 4 deletions

diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java
index dc92ac3e..fb0ef75a 100644
--- a/src/com/android/incallui/CallCardFragment.java
+++ b/src/com/android/incallui/CallCardFragment.java
@@ -586,6 +586,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
             } else {
                 mCallStateLabel.startAnimation(mPulseAnimation);
             }
+        } else {
+            mCallStateLabel.clearAnimation();
         }
 
         if (callStateIcon != null) {
@@ -606,10 +608,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
                 ((AnimationDrawable) callStateIcon).start();
             }
         } else {
-            Animation callStateIconAnimation = mCallStateIcon.getAnimation();
-            if (callStateIconAnimation != null) {
-                callStateIconAnimation.cancel();
-            }
+            mCallStateIcon.clearAnimation();
 
             // Invoke setAlpha(float) instead of setAlpha(int) to set the view's alpha. This is
             // needed because the pulse animation operates on the view alpha.