commit e33213bc4cebc6c18b35aceaa71b1647271f968a
author Andrew Lee <anwlee@google.com> Tue Aug 04 19:44:56 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 04 19:44:56 2015 +0000
tree 315038bbc31e0ad339c964cd831664fe825b3460
parent 07364d6aade5e05a403d16a3b366085bdb2710a0
parent a2db8bae0eb1b7c08fabc31fb13f4ef2d859f990

Merge "Fix time and details alignment in RTL." into mnc-dev

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 4fc60ca..29cdd4d 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -124,7 +124,8 @@
      */
     @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);
         }
     }