From 07364d6aade5e05a403d16a3b366085bdb2710a0 Mon Sep 17 00:00:00 2001
From: Jay Shrauner <shrauner@google.com>
Date: Mon, 3 Aug 2015 16:57:32 -0700
Subject: Fix NPE in onDetailsChanged

Bug:22925987
Change-Id: I20ad0ea5e40342805a2004654e6b78f420c33873
---
 InCallUI/src/com/android/incallui/CallButtonPresenter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'InCallUI/src/com/android/incallui')

diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index 4fc60cac8..29cdd4ddc 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -124,7 +124,8 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
      */
     @Override
     public void onDetailsChanged(Call call, android.telecom.Call.Details details) {
-        if (getUi() != null && Objects.equals(call, mCall)) {
+        // Only update if the changes are for the currently active call
+        if (getUi() != null && call != null && call.equals(mCall)) {
             updateButtonsState(call);
         }
     }
-- 
cgit v1.2.3