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
commitbcf67a242d110aa666e695adf3c6517f9805f2e4 (patch)
treee7cac1302daa04bd70a921a5ef9da07225906b6f
parentcc0443f3e0b8f4fce6ff41778d3e3c41e819142f (diff)
parent599477afdf26bee779515ead4638effea8d6beaa (diff)
downloadInCallUI-bcf67a242d110aa666e695adf3c6517f9805f2e4.tar.gz
am 599477af: Null protect getUi() in configureAnswerTargetsForSms
* commit '599477afdf26bee779515ead4638effea8d6beaa': Null protect getUi() in configureAnswerTargetsForSms
-rw-r--r--src/com/android/incallui/AnswerPresenter.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/incallui/AnswerPresenter.java b/src/com/android/incallui/AnswerPresenter.java
index 1453fa51..a5a88ffa 100644
--- a/src/com/android/incallui/AnswerPresenter.java
+++ b/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)