diff options
| author | Andrew Lee <anwlee@google.com> | 2014-06-05 23:15:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 23:15:47 +0000 |
| commit | ca2f6197a1269737c4d6b1910be418400e720147 (patch) | |
| tree | 5bd3c09d26eb07fbd6d0118e2980972b0f0fb93a /InCallUI | |
| parent | 3ee6d23053027c6ac5a63cc2b0e7c725aa54c419 (diff) | |
| parent | b42b68d0a67bf1e8146cb54a93717293a8778406 (diff) | |
am 00764eb9: Merge "Fix NPE because of null animation in CallCardFragment." into lmp-preview-dev
* commit '00764eb981c568d08083c7cfc1b72b7bdc4d4fd2':
Fix NPE because of null animation in CallCardFragment.
Diffstat (limited to 'InCallUI')
| -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 bdb1f9fb1..5adb0521e 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); } |