diff -r 94dc1107e8b2 -r 40a3f856b14d phoneapp/phoneuistates/src/cphonecallsetup.cpp --- a/phoneapp/phoneuistates/src/cphonecallsetup.cpp Thu Jul 15 18:38:16 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphonecallsetup.cpp Thu Aug 19 09:54:27 2010 +0300 @@ -103,18 +103,16 @@ case MEngineMonitor::EPEMessageConnecting: HandleConnectingL( aCallId ); break; - - case MEngineMonitor::EPEMessageShowVersion: - { - if ( iStateMachine->SecurityMode()->IsSecurityMode() ) - { - // Do nothing if security mode is enabled. - return; - } - } - // Fall through - // fall through. + case MEngineMonitor::EPEMessageShowVersion: + { + if ( iStateMachine->SecurityMode()->IsSecurityMode() ) + { + // Do nothing if security mode is enabled. + return; + } + } + // Fall through case MEngineMonitor::EPEMessageIssuingSSRequest: case MEngineMonitor::EPEMessageCallBarred: case MEngineMonitor::EPEMessageIssuedSSRequest: @@ -159,12 +157,12 @@ // set when the CDMA network receives the call, not (like in GSM) when // when the remote party receives the call. So, in CDMA, the user // should still be able to cancel the MO call before the call is connected. - __LOGMETHODSTARTEND( EPhoneUIStates, - "CPhoneCallSetup::HandleConnectingL()"); - + __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneCallSetup::HandleConnectingL()"); BeginUiUpdateLC(); UpdateRemoteInfoDataL ( aCallId ); + SetNeedToReturnToForegroundAppStatusL( EFalse ); + // Re-enable global notes TPhoneCmdParamBoolean globalNotifierParam; globalNotifierParam.SetBoolean( EFalse ); @@ -191,9 +189,7 @@ EndUiUpdate(); - // Go to alerting state UpdateCbaL( EPhoneCallHandlingInCallCBA ); - iStateMachine->ChangeState( EPhoneStateAlerting ); }