diff options
Diffstat (limited to 'java/com')
| -rw-r--r-- | java/com/android/incallui/AnswerScreenPresenter.java | 4 | ||||
| -rw-r--r-- | java/com/android/incallui/InCallActivity.java | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/java/com/android/incallui/AnswerScreenPresenter.java b/java/com/android/incallui/AnswerScreenPresenter.java index a0c76f345..0b79e4be7 100644 --- a/java/com/android/incallui/AnswerScreenPresenter.java +++ b/java/com/android/incallui/AnswerScreenPresenter.java @@ -140,7 +140,9 @@ public class AnswerScreenPresenter return; } incomingCall.setIsSpeakEasyCall(true); - incomingCall.answer(); + InCallActivity inCallActivity = + (InCallActivity) answerScreen.getAnswerScreenFragment().getActivity(); + inCallActivity.onPrimaryCallStateChanged(); } @Override diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index 8f0fbadff..0c57dff7b 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -1396,8 +1396,10 @@ public class InCallActivity extends TransactionSafeFragmentActivity return new ShouldShowUiResult(false, null); } - // TODO(erfanian): Get a better call? - DialerCall call = CallList.getInstance().getActiveCall(); + DialerCall call = + CallList.getInstance().getIncomingCall() != null + ? CallList.getInstance().getIncomingCall() + : CallList.getInstance().getActiveCall(); if (call == null) { return new ShouldShowUiResult(false, call); @@ -1417,7 +1419,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity private ShouldShowUiResult getShouldShowAnswerUi() { DialerCall call = CallList.getInstance().getIncomingCall(); - if (call != null) { + if (call != null && !call.isSpeakEasyCall()) { LogUtil.i("InCallActivity.getShouldShowAnswerUi", "found incoming call"); return new ShouldShowUiResult(true, call); } |