summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-14 00:15:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-14 00:15:03 +0000
commit8c9aa3cb0f279796df48948ad87b170b742c8d75 (patch)
tree33ed94aa17e6704e52dd1edca726cb5d54e5f9db
parent0dbd837fca57e320d0143500848d1c8221b0d502 (diff)
parent5eb0993cf86b68972e0e790b888c6640a140dfb0 (diff)
downloadandroid_packages_apps_InCallUI-8c9aa3cb0f279796df48948ad87b170b742c8d75.tar.gz
android_packages_apps_InCallUI-8c9aa3cb0f279796df48948ad87b170b742c8d75.tar.bz2
android_packages_apps_InCallUI-8c9aa3cb0f279796df48948ad87b170b742c8d75.zip
am 5eb0993c: am bcf67a24: am 599477af: Null protect getUi() in configureAnswerTargetsForSms
* commit '5eb0993cf86b68972e0e790b888c6640a140dfb0': 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)