summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-14 16:42:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-14 16:42:10 +0000
commit132c62d8e81eef44209b4b099a175f26c3ce5278 (patch)
tree6ada6befbe8c14d2924c62e33dd5b7ac2e37d58f
parentbaec751a7a9555cb92e2d918ef39daeb55a4dba9 (diff)
parent31c10ee93f7460b50f38ccd4e4366739fb240410 (diff)
am cc81d793: am 8c9aa3cb: am 5eb0993c: am bcf67a24: am 599477af: Null protect getUi() in configureAnswerTargetsForSms
* commit 'cc81d79368ffc2f5df5ac6f4baefbd2155632848': 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)