diff options
| author | Andrew Lee <anwlee@google.com> | 2014-06-05 22:47:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-05 22:47:09 +0000 |
| commit | b42b68d0a67bf1e8146cb54a93717293a8778406 (patch) | |
| tree | 4cf81f88aea13f24922fab2d2c4a5b933e61fa81 | |
| parent | 30e3eb36b17c0f0ff98a795108612b055fa061f7 (diff) | |
| parent | e7502ad31e1bf73fc4de020408435ce593c8fae8 (diff) | |
Merge "Fix NPE because of null animation in CallCardFragment." into lmp-preview-dev
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index db3f9a6c4..8d8fc8ad3 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -305,7 +305,10 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mCallStateLabel.startAnimation(mPulseAnimation); } } else { - mCallStateLabel.getAnimation().cancel(); + Animation callStateAnimation = mCallStateLabel.getAnimation(); + if (callStateAnimation != null) { + callStateAnimation.cancel(); + } mCallStateLabel.setAlpha(0); mCallStateLabel.setVisibility(View.GONE); } |