commit 4f5b60270e59c8e7dfb22489361ef83c4630485a
author Christine Chen <christinech@google.com> Thu Sep 05 19:24:04 2013 -0700
committer Christine Chen <christinech@google.com> Thu Sep 05 19:24:04 2013 -0700
tree b35a5ad107bea23163a17ce933788defbe812642
parent c0b82350c4ab2e2040d896356c0e60479f56dff8

Adds UI null check.

- Fixes NullPointerException that happens sometimes when the UI is asked
  to bring up the reject with text message popup.

Bug: 10608694
Change-Id: I32b8d9f0e1c115dd07ec6000275a882a4b9e1316

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 4c0f1d6..7f27133 100644
--- a/InCallUI/src/com/android/incallui/AnswerPresenter.java
+++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java
@@ -127,12 +127,16 @@
     }
 
     public void onText() {
-        getUi().showMessageDialogue();
+        if (getUi() != null) {
+            getUi().showMessageDialogue();
+        }
     }
 
     public void rejectCallWithMessage(String message) {
         Log.d(this, "sendTextToDefaultActivity()...");
-        getUi().dismissPopup();
+        if (getUi() != null) {
+            getUi().dismissPopup();
+        }
         CallCommandClient.getInstance().rejectCall(mCallId, true, message);
     }