summaryrefslogtreecommitdiff
path: root/InCallUI/src/com/android
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2013-09-16 15:10:29 -0700
committerMakoto Onuki <omakoto@google.com>2013-09-16 15:34:33 -0700
commit856fa7f3d1e59c18c76e583041f945b65436842b (patch)
tree6bc8e4985d252013a641a8a27a11e295aa94b4d2 /InCallUI/src/com/android
parent3687bb1c3d59e25d4ec0e5c5f4cafbbd8bffb00d (diff)
Add a missing null check.
Apparently Call can still be null during the INCALL state. Bug 10699042 Change-Id: Ide8a0605a5f078dbfc12cc05d40d90f6aa8e9c76
Diffstat (limited to 'InCallUI/src/com/android')
-rw-r--r--InCallUI/src/com/android/incallui/CallButtonPresenter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index d1625ecf2..6b05ff5c7 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -74,7 +74,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
// OUTGOING. We may want to do that once we start showing "Voice mail" label on
// the dialpad too.)
if (mPreviousState == InCallState.OUTGOING
- && PhoneNumberUtils.isVoiceMailNumber(mCall.getNumber())) {
+ && mCall != null && PhoneNumberUtils.isVoiceMailNumber(mCall.getNumber())) {
getUi().displayDialpad(true);
}
} else {