diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-06-20 05:03:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-20 05:03:23 +0000 |
| commit | 52714642784baa08d463ae225fec74c98dddf087 (patch) | |
| tree | fe7d1e278221fc3ca4b3cccb75fe04ae5f149d52 /InCallUI | |
| parent | 84ba139ee9c6078b071e5cb505d7a4d9377712bb (diff) | |
| parent | 2d7bf90875bea954ceacdacd9e52c840200bde37 (diff) | |
Merge "Make sure to remove CallCardPresenter from CallUpdateListeners map" into mnc-dev
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; |