MCL/sf/app/phone: comparison phoneengine/callhandling/src/cpecallhandling.cpp

equal deleted inserted replaced

-:41a7f70b3818
+:5266b1f337bd
 #include    <pepanic.pan>
 #include    <talogger.h>
 #include    <PSVariables.h>
 #include    <ctsydomainpskeys.h>
 #include    <mccecall.h>
-#include    <psetsaobserver.h>
+#include    <PsetSAObserver.h>
 #include    <cccecallparameters.h>
 #include    <centralrepository.h>
+#include    <telconfigcrkeys.h>
 // EXTERNAL DATA STRUCTURES
 // None
 // EXTERNAL FUNCTION PROTOTYPES
 // None
 // CONSTANTS
-/******************************************************************************
-* Telephony Configuration API
-* Keys under this category are used in defining telephony configuration.
-******************************************************************************/
-const TUid KCRUidTelConfiguration = {0x102828B8};
-/**
-* Amount of digits to be used in contact matching.
-* This allows a customer to variate the amount of digits to be matched.
-*/
-const TUint32 KTelMatchDigits                               = 0x00000001;
 const TInt KPEMatchDefault = 7;
 // MACROS
 // None
 MCCECall& connectedCall = call->Call();
 CCPCall::TCallType callType = connectedCall.Parameters().CallType();
 if ( EPEStateConnected == call->GetCallState() )
 {
 if ( callType == CCPCall::ECallTypePS )
 {
 TEFLOGSTRING( KTAMESINT,
 "CALL CPECallHandling::SendMessage -> EPEMessageRemotePartyInfoChanged->update call type to PS");
 iModel.DataStore()->SetCallType( EPECallTypeVoIP, aCallId );
 TEFLOGSTRING( KTAMESINT,
 "CALL CPECallHandling::SendMessage -> EPEMessageRemotePartyInfoChanged->update call type to CS");
 iCallOpenParams->SetCallType( CCPCall::ECallTypeCSVoice );
 iModel.DataStore()->SetServiceIdCommand( 1 );
 iModel.DataStore()->SetCallType( EPECallTypeCSVoice, aCallId );
 if ( UpdateColpNumber( aCallId, connectedCall ))
 {
 iModel.SendMessage( MEngineMonitor::EPEMessageColpNumberAvailable, aCallId );
 }
 }
 }
 else
 {
 // Dial request passed on successfully: forward new call id
 aCallId = callData->GetCallId();
+iModel.SendMessage( MEngineMonitor::EPEMessageInitiatedMoCall, aCallId );
 }
 }
 }
 else
 {
 errorCode = iVideoCallHandling->HangUp( aCallId );
 }
 else if ( CallIdCheck::IsConference( aCallId ) )
 {
-if( iConferenceCall )
+errorCode = ReleaseConference();
-{
-errorCode = iConferenceCall->HangUp();
-}
 }
 return errorCode;
 }
 // -----------------------------------------------------------------------------
 TEFLOGSTRING( KTAMESINT, "CALL CPECallHandling::TerminateAllConnections");
 RejectCall(); // Rejects ringing call if one exists.
-if ( iConferenceCall )
+ReleaseConference(); // Release conference call if exists
-{
-TEFLOGSTRING( KTAMESOUT,
-"CALL CPECallHandling::TerminateAllConnections: Hanging Up conference call" );
-iConferenceCall->HangUp();
-}
 // Hangup normal Voice Calls
 for( TInt callId = 0; callId < KPEMaximumNumberOfVoiceCalls; callId++ )
 {
 callData = iCallArrayOwner->GetCallObject( callId );
 }
 }
 }
 //Terminate all ringing data calls, connected data calls and packet data connections
 return iVideoCallHandling->TerminateAllConnections();
+}
+// -----------------------------------------------------------------------------
+// CPECallHandling::UpdatePhoneIdentity
+// Method updates phone identity
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TInt CPECallHandling::UpdatePhoneIdentity(
+MEngineMonitor::TPEMessagesFromPhoneEngine /*aMessage*/ )
+{
+TInt retValue( KErrNone );
+CSInfo csinfo;
+retValue = iConvergedCallEngine.GetCSInfo( csinfo );
+TPEPhoneIdentityParameters phoneIdentityParameters;
+phoneIdentityParameters.iSerialNumber = csinfo.iSerialNumber;
+iModel.DataStore()->SetPhoneIdentityParameters( phoneIdentityParameters );
+SendMessage( MEngineMonitor::EPEMessageShowIMEI );
+return retValue;
 }
 // -----------------------------------------------------------------------------
 // CPECallHandling::IsCallInState
 // returns ETrue if there is a call in given state; otherwise EFalse
 TEFLOGSTRING( KTAINT, "CALL CPECallHandling::DialEmergencyCall" );
 SendMessage( MEngineMonitor::EPEMessageInitiatedEmergencyCall );
 TEFLOGSTRING( KTAINT, "CALL CPECallHandling::DialEmergencyCall start emergency dialing" );
 CPESingleCall* callData = iCallArrayOwner->GetCallObject( KPEEmergencyCallId );
-if ( callData )
+// coverity[dereference]
-{
+callData->DialEmergency( aEmergencyNumber );
-callData->DialEmergency( aEmergencyNumber );
-}
 }
 // -----------------------------------------------------------------------------
 // CPECallHandling::GetCallTerminatedDiagnostics
 // Returns call terminated diagnostics of a call
 }
 TEFLOGSTRING( KTAINT, "CALL CPECallHandling::CreateConferenceCallL end" );
 }
+// -----------------------------------------------------------------------------
+// CPECallHandling::GetLifeTime
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TBool CPECallHandling::GetLifeTime( TDes8& aLifeTimeInfo )
+{
+TEFLOGSTRING( KTAINT, "CALL CPECallHandling::GetLifeTime" );
+return iConvergedCallEngine.GetLifeTime( aLifeTimeInfo );
+}
 // -----------------------------------------------------------------------------
 // CPECallHandling::UpdateSaSetting
 // -----------------------------------------------------------------------------
 //
 void CPECallHandling::UpdateSaSetting()
 }
 }
 else
 {
 CPESingleCall* callData = iCallArrayOwner->CallPointerByState( EPEStateHeld );
-// Check that no actice and held call, if waiting call gets idle
+if ( callData )
-CPESingleCall* connectedCallData = iCallArrayOwner->CallPointerByState( EPEStateConnected );
+{
-if( callData && ( iModel.DataStore()->ResumeHeldCall( callData->GetCallId() ) )
+// Checks to be done in case waiting call gets idle state:
-&& !connectedCallData )
+// Check that no active and held calls case
-{
+// Check that no dialling/connecting and held calls case
-TEFLOGSTRING( KTAINT, "CALL CPECallHandling::HandleAutoResume single" );
+if ( iModel.DataStore()->ResumeHeldCall( callData->GetCallId() ) &&
-callData->Resume();
+!IsCallInState( EPEStateConnected ) &&
+!IsCallInState( EPEStateConnecting ) &&
+!IsCallInState( EPEStateDialing ) )
+{
+TEFLOGSTRING( KTAINT, "CALL CPECallHandling::HandleAutoResume single" );
+callData->Resume();
+}
 }
 }
 }
 // -----------------------------------------------------------------------------
 const CCCPCallParameters& parameters = aCall.Parameters();
 CCPCall::TCallType callType = parameters.CallType();
 if ( callType == CCPCall::ECallTypeCSVoice || callType == CCPCall::ECallTypeVideo )
 {
 const CCCECallParameters& params = static_cast<const CCCECallParameters&>( parameters );
-if ( params.Origin() == CCCECallParameters::ECCECallOriginSAT )
+// do not overwrite if it's client call, which CCE is not aware of
-{
+if ( iModel.DataStore()->CallOrigin( aCallId ) == EPECallOriginPhone )
-iModel.DataStore()->SetCallOrigin( EPECallOriginSAT, aCallId );
+{
-iModel.DataStore()->SetRemoteName( params.AlphaId(), aCallId );
+if ( params.Origin() == CCCECallParameters::ECCECallOriginSAT )
-iModel.DataStore()->SetRemotePhoneNumber( KNullDesC(), aCallId );
+{
-}
+iModel.DataStore()->SetCallOrigin( EPECallOriginSAT, aCallId );
+}
+}
 }
 }
 // -----------------------------------------------------------------------------
 // CPECallHandling::UpdateColpNumber
 // -----------------------------------------------------------------------------
 //
 updateDone = ETrue;
 }
 return updateDone;
 }
+// -----------------------------------------------------------------------------
+// CPECallHandling::ReleaseConference
+// Release conference call
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TInt CPECallHandling::ReleaseConference()
+{
+TInt errorCode( ECCPErrorNotFound );
+if ( iConferenceCall )
+{
+errorCode = iConferenceCall->HangUp();
+}
+return errorCode;
+}
 //  End of File

branch	RCL_3
changeset 25	5266b1f337bd
parent 24	41a7f70b3818