Make sure to remove CallCardPresenter from CallUpdateListeners map

Bug: 21959749
Change-Id: I6662d96b9caaf3c5c94cfc0453cdd226ab850cec

1 files changed, 4 insertions, 0 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 5cbffa628..39911e01a 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -226,6 +226,10 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
             mPrimary.setSessionModificationState(Call.SessionModificationState.NO_REQUEST);
         }
 
+        if (previousPrimary != null && mPrimary == null) {
+            CallList.getInstance().removeCallUpdateListener(previousPrimary.getId(), this);
+        }
+
         if (mSecondary == null) {
             // Secondary call may have ended.  Update the ui.
             mSecondaryContactInfo = null;