commit 76d131871fa1a778833203284f0bf38bb1a4e661
author Yorke Lee <yorkelee@google.com> Mon Jul 13 19:27:42 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 13 19:27:42 2015 +0000
tree 99a4a0245b1f92b89c7bdbf884009659963f54a6
parent 1abe7966b039d1ddc77b4ea0d15b23770c456152
parent 24b5503ebfa1edb683ed6e574a17d2e3f34732dc

am 599477af: Null protect getUi() in configureAnswerTargetsForSms

* commit '599477afdf26bee779515ead4638effea8d6beaa':
  Null protect getUi() in configureAnswerTargetsForSms

InCallUI/src/com/android/incallui/AnswerPresenter.java

diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java
index 1453fa5..a5a88ff 100644
--- a/InCallUI/src/com/android/incallui/AnswerPresenter.java
+++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java
@@ -265,6 +265,9 @@
     }
 
     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)