summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-06-05 11:59:12 -0700
committerAndrew Lee <anwlee@google.com>2014-06-05 11:59:12 -0700
commite7502ad31e1bf73fc4de020408435ce593c8fae8 (patch)
tree156b6ad2697ebc9a484fb22f9bb114950cb867ef
parent33be20ab81eae293abd978ac41cb1c990d51dc4b (diff)
Fix NPE because of null animation in CallCardFragment.
Bug: 15448134 Change-Id: Iaf61864720b2398ca2cd883fd8058dd71f7b7334
-rw-r--r--InCallUI/src/com/android/incallui/CallCardFragment.java5
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 02f70db87..557331f0a 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -304,7 +304,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);
}