summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-14 16:25:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-14 16:25:33 +0000
commit31c10ee93f7460b50f38ccd4e4366739fb240410 (patch)
tree99a4a0245b1f92b89c7bdbf884009659963f54a6
parent43fa9563e7e26ac9860a11c63890465ed90eede5 (diff)
parent8241b72bf21008d60e1822042c1e8433c8eb4a64 (diff)
am 8c9aa3cb: am 5eb0993c: am bcf67a24: am 599477af: Null protect getUi() in configureAnswerTargetsForSms
* commit '8c9aa3cb0f279796df48948ad87b170b742c8d75': 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)