commit 276177433993b897bab15f1ecfd47a0a97f38f45
author Santos Cordon <santoscordon@google.com> Wed Nov 12 16:56:30 2014 -0800
committer Santos Cordon <santoscordon@google.com> Wed Nov 12 17:03:07 2014 -0800
tree 01e05158cd68ae0745eab30d37056da4a91757e0
parent 15992ac1aba12271f185a9d842f9b91f14202127

Add Null check for CanAddCall.

Missing null check in recently added CanAddCall property.

Bug: 18358924
Change-Id: Ia94e621b339fbd08ad074baa6eec787a90bb0fa4

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

diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index 3541026..8c38294 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -114,12 +114,9 @@
      */
     @Override
     public void onDetailsChanged(Call call, android.telecom.Call.Details details) {
-        // If the details change is not for the currently active call no update is required.
-        if (!Objects.equals(call, mCall)) {
-            return;
+        if (getUi() != null && Objects.equals(call, mCall)) {
+            updateCallButtons(call, getUi().getContext());
         }
-
-        updateCallButtons(call, getUi().getContext());
     }
 
     @Override
@@ -129,7 +126,7 @@
 
     @Override
     public void onCanAddCallChanged(boolean canAddCall) {
-        if (mCall != null) {
+        if (getUi() != null && mCall != null) {
             updateCallButtons(mCall, getUi().getContext());
         }
     }