summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRavindra <c_rthat@codeaurora.org>2014-11-11 14:21:02 +0530
committerArne Coucheron <arco68@gmail.com>2014-12-13 01:45:40 +0100
commit2f3784434a86c90f0d5aa6a1a42b49040dd995ba (patch)
treeb8614bc2b37844c016472c262a6fb7f349ccd6d3
parent6fc6844f80cb3b957045784161409e3daffabcf9 (diff)
downloadpackages_apps_InCallUI-2f3784434a86c90f0d5aa6a1a42b49040dd995ba.tar.gz
packages_apps_InCallUI-2f3784434a86c90f0d5aa6a1a42b49040dd995ba.tar.bz2
packages_apps_InCallUI-2f3784434a86c90f0d5aa6a1a42b49040dd995ba.zip
Display InCallUI on auto answer
When a MT call is auto answered bring the InCallUI to foreground by starting the InCallActivity Change-Id: I77e21f41699fa3ff78dd793d2f226ad95d11497f CRs-Fixed: 749609
-rw-r--r--src/com/android/incallui/InCallPresenter.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java
index 35c527ae..655e79a9 100644
--- a/src/com/android/incallui/InCallPresenter.java
+++ b/src/com/android/incallui/InCallPresenter.java
@@ -864,6 +864,15 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
newState == InCallState.OUTGOING;
boolean isAnyOtherSubActive = InCallState.INCOMING == newState &&
mCallList.isAnyOtherSubActive(mCallList.getActiveSubscription());
+
+ //If the call is auto answered bring up the InCallActivity
+ boolean isAutoAnswer = false;
+ isAutoAnswer = (mInCallState == InCallState.INCOMING) &&
+ (newState == InCallState.INCALL) &&
+ (mInCallActivity == null);
+
+ Log.d(this, "startOrFinishUi: " + isAutoAnswer);
+
if ((newState == mInCallState && !(mInCallActivity == null && isAnyOtherSubActive))
|| alreadyOutgoing) {
return newState;
@@ -927,7 +936,7 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
return mInCallState;
}
- if (showCallUi || showAccountPicker) {
+ if (showCallUi || showAccountPicker || isAutoAnswer) {
Log.i(this, "Start in call UI");
showInCall(false /* showDialpad */, !showAccountPicker /* newOutgoingCall */);
} else if (startStartupSequence) {