diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-06-20 05:11:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-20 05:11:11 +0000 |
| commit | e1d806e8ec260e38720a2cb883365ed2b148d6de (patch) | |
| tree | c3bb6b9d82b9c265f231fb0bcf3aebba8df798ba /InCallUI | |
| parent | f773301a402e1bd163eba1168a8d586bddeca2f9 (diff) | |
| parent | 52714642784baa08d463ae225fec74c98dddf087 (diff) | |
am f4a06ae3: Merge "Make sure to remove CallCardPresenter from CallUpdateListeners map" into mnc-dev
* commit 'f4a06ae39c120b27d7f5e5f05e6224c853d5b934':
Make sure to remove CallCardPresenter from CallUpdateListeners map
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 4 |
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 c93fe4cb4..cef0cd5c3 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -228,6 +228,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; |