From fa0c573d689a16401f1bf801d93b7b37d2380c5c Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Wed, 24 Jun 2015 15:44:17 -0700 Subject: Fix issue where upgrade request UX does not show. + adding back CallList listener to handle the onUpgradeToVideo event. This was removed when InCall fragments were refactored (before the onUpgradeToVideo method existed) in mnc-dev; meanwhile in m-wireless-dev the new onUpgradeToVideo listener was added. Bug: 21850707 Change-Id: I85df2feee5094bdde530cf810da3930745897b4d --- InCallUI/src/com/android/incallui/AnswerPresenter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java index 02dbfca83..a44249b2c 100644 --- a/InCallUI/src/com/android/incallui/AnswerPresenter.java +++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java @@ -48,6 +48,7 @@ public class AnswerPresenter extends Presenter @Override public void onUiShowing(boolean showing) { if (showing) { + CallList.getInstance().addListener(this); final CallList calls = CallList.getInstance(); Call call; call = calls.getIncomingCall(); @@ -60,6 +61,7 @@ public class AnswerPresenter extends Presenter processVideoUpgradeRequestCall(call); } } else { + CallList.getInstance().removeListener(this); // This is necessary because the activity can be destroyed while an incoming call exists. // This happens when back button is pressed while incoming call is still being shown. if (mCallId != null) { -- cgit v1.2.3