diff options
| -rw-r--r-- | InCallUI/src/com/android/incallui/AnswerPresenter.java | 24 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 5 |
2 files changed, 14 insertions, 15 deletions
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java index 950db3912..1453fa517 100644 --- a/InCallUI/src/com/android/incallui/AnswerPresenter.java +++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java @@ -71,18 +71,16 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi> @Override public void onIncomingCall(InCallState oldState, InCallState newState, Call call) { Log.d(this, "onIncomingCall: " + this); - if (getUi() != null) { - Call modifyCall = CallList.getInstance().getVideoUpgradeRequestCall(); - if (modifyCall != null) { - showAnswerUi(false); - Log.d(this, "declining upgrade request id: "); - CallList.getInstance().removeCallUpdateListener(mCallId, this); - InCallPresenter.getInstance().declineUpgradeRequest(getUi().getContext()); - } - if (!call.getId().equals(mCallId)) { - // A new call is coming in. - processIncomingCall(call); - } + Call modifyCall = CallList.getInstance().getVideoUpgradeRequestCall(); + if (modifyCall != null) { + showAnswerUi(false); + Log.d(this, "declining upgrade request id: "); + CallList.getInstance().removeCallUpdateListener(mCallId, this); + InCallPresenter.getInstance().declineUpgradeRequest(getUi().getContext()); + } + if (!call.getId().equals(mCallId)) { + // A new call is coming in. + processIncomingCall(call); } } @@ -98,7 +96,7 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi> public void onDisconnect(Call call) { // no-op } - + public void onSessionModificationStateChange(int sessionModificationState) { boolean isUpgradePending = sessionModificationState == Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST; diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index 236129637..ff1a50fcb 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -219,6 +219,9 @@ public class InCallPresenter implements CallList.Listener, mProximitySensor = proximitySensor; addListener(mProximitySensor); + addIncomingCallListener(mAnswerPresenter); + addInCallUiListener(mAnswerPresenter); + mCallList = callList; // This only gets called by the service so this is okay. @@ -1556,8 +1559,6 @@ public class InCallPresenter implements CallList.Listener, * Private constructor. Must use getInstance() to get this singleton. */ private InCallPresenter() { - addIncomingCallListener(mAnswerPresenter); - addInCallUiListener(mAnswerPresenter); } /** |