summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Chen <christinech@google.com>2013-09-06 10:18:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-06 10:18:03 -0700
commitaa3bf5aa44aad01888a0aa1efe336ab5c4ca9b36 (patch)
treeb35a5ad107bea23163a17ce933788defbe812642
parent7057a88cedeb0f2f8da58a4697a2d4a4dc0b948f (diff)
parent5a85cb01e8a0bbe5de68a1ff9fc124ba8ff7e41f (diff)
am a9d118f6: am 54601f65: Adds UI null check.
* commit 'a9d118f6c65a6af7af80e9a503bf4b12c8f3ff44': Adds UI null check.
-rw-r--r--InCallUI/src/com/android/incallui/AnswerPresenter.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java
index 4c0f1d628..7f27133ed 100644
--- a/InCallUI/src/com/android/incallui/AnswerPresenter.java
+++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java
@@ -127,12 +127,16 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi>
}
public void onText() {
- getUi().showMessageDialogue();
+ if (getUi() != null) {
+ getUi().showMessageDialogue();
+ }
}
public void rejectCallWithMessage(String message) {
Log.d(this, "sendTextToDefaultActivity()...");
- getUi().dismissPopup();
+ if (getUi() != null) {
+ getUi().dismissPopup();
+ }
CallCommandClient.getInstance().rejectCall(mCallId, true, message);
}