diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-06-20 05:44:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-20 05:44:45 +0000 |
| commit | 4f9c40aaac38a30395f81f3e768aa04b2a075c30 (patch) | |
| tree | f0c641a3121ba56aa732783b52580d6c7510e153 /InCallUI | |
| parent | 12ca2a101ae01227a913acaca45cb4ada48ae590 (diff) | |
| parent | 87e42435b21d4554ceeafaa7b9defe0eb83caeed (diff) | |
am 6a14c295: am d6828206: am f4a06ae3: Merge "Make sure to remove CallCardPresenter from CallUpdateListeners map" into mnc-dev
* commit '6a14c29554d89502c48709bd14685df6ed3f43aa':
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 34abc9eaa..69921424f 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; |