summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-13 23:37:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-13 23:37:54 +0000
commit97910c8fc579f17e6f2fe464a55b7ad47681252f (patch)
treec9a145c509081fd1c4d99c299dc55c7bf9a77a09 /InCallUI
parentef66307dcf604b21c135679b36f3b274e58d2c1f (diff)
parentd3b2513b2e39c6979c1fb88920e00d4d1edb13e3 (diff)
am bcf67a24: am 599477af: Null protect getUi() in configureAnswerTargetsForSms
* commit 'bcf67a242d110aa666e695adf3c6517f9805f2e4': Null protect getUi() in configureAnswerTargetsForSms
Diffstat (limited to 'InCallUI')
-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)