summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-13 23:02:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-13 23:02:28 +0000
commitd3b2513b2e39c6979c1fb88920e00d4d1edb13e3 (patch)
treeb225c1fdbd3e1eafd96b7f8c713898e5e6d95ada
parent220fdac3b1b8978b440e9c405f8e2642e8084bb3 (diff)
parent24b5503ebfa1edb683ed6e574a17d2e3f34732dc (diff)
am 599477af: Null protect getUi() in configureAnswerTargetsForSms
* commit '599477afdf26bee779515ead4638effea8d6beaa': Null protect getUi() in configureAnswerTargetsForSms
-rw-r--r--InCallUI/src/com/android/incallui/AnswerPresenter.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java
index 1453fa517..a5a88ffa5 100644
--- a/InCallUI/src/com/android/incallui/AnswerPresenter.java
+++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java
@@ -265,6 +265,9 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi>
}
private void configureAnswerTargetsForSms(Call call, List<String> textMsgs) {
+ if (getUi() == null) {
+ return;
+ }
mHasTextMessages = textMsgs != null;
boolean withSms =
call.can(android.telecom.Call.Details.CAPABILITY_RESPOND_VIA_TEXT)