Fix mismerge.

Caused in-call UI not to come up for outgoing calls.

Change-Id: Ie67c26b8a477aa224d181ce1b8f2640c990b7f41

1 files changed, 5 insertions, 13 deletions

diff --git a/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java
index 743f667d..72c1b173 100644
--- a/src/com/android/incallui/InCallPresenter.java
+++ b/src/com/android/incallui/InCallPresenter.java
@@ -964,24 +964,16 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
 
         // TODO: Consider a proper state machine implementation
 
-        // If the state isn't changing or if we're transitioning from pending outgoing to actual
-        // outgoing, we have already done any starting/stopping of activities in a previous pass
-        // ...so lets cut out early
-        boolean alreadyOutgoing = mInCallState == InCallState.PENDING_OUTGOING &&
-                newState == InCallState.OUTGOING;
+        // If the state isn't changing we have already done any starting/stopping of activities in
+        // a previous pass...so lets cut out early
         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);
+        boolean isAutoAnswer = mInCallState == InCallState.INCOMING &&
+                newState == InCallState.INCALL && mInCallActivity == null;
 
-        Log.d(this, "startOrFinishUi: " + isAutoAnswer);
-
-        if ((newState == mInCallState && !(mInCallActivity == null && isAnyOtherSubActive))
-                || alreadyOutgoing) {
+        if (newState == mInCallState && !(mInCallActivity == null && isAnyOtherSubActive)) {
             return newState;
         }