--- a/phoneengine/phonemodel/src/cpemessagehandler.cpp Mon May 03 12:31:11 2010 +0300
+++ b/phoneengine/phonemodel/src/cpemessagehandler.cpp Fri May 14 15:51:57 2010 +0300
@@ -1318,7 +1318,8 @@
"PE CPEMessageHandler::UpdateClientInfo, allowmatch: %d",
clientInformation.AllowMatch() );
- if ( clientInformation.AllowMatch() && ( aCallId != KPEEmergencyCallId ) )
+ if ( EPECallOriginSAT != iDataStore.CallOrigin(aCallId) &&
+ ( aCallId != KPEEmergencyCallId ) )
{
TEFLOGSTRING2(
KTAINT,
@@ -1342,10 +1343,6 @@
"PE CPEMessageHandler::UpdateClientInfo > MPEContactHandling::FindContactInfoSync( EPEFindWithPhoneNumber ), error code: %d",
errorCode );
}
- else if ( clientInformation.Name().Length() )
- {
- iDataStore.SetRemoteName( clientInformation.Name(), aCallId );
- }
// Calls have to log also without a contact (ECCPErrorNotFound).
if ( errorCode == ECCPErrorNone || errorCode == ECCPErrorNotFound)
@@ -1863,6 +1860,10 @@
{
HandleClientCallData();
}
+ else
+ {
+ iDataStore.SetCallOriginCommand(EPECallOriginPhone);
+ }
//Get number of calls
numberOfCalls = iCallHandling.GetNumberOfCalls();
@@ -3003,4 +3004,30 @@
return errorCode;
}
-// End of File
+
+// -----------------------------------------------------------------------------
+// CPEMessageHandler::ExecuteKeySequenceL
+// Only sequences which are not issued with send-key are handled here. SS
+// commands etc. are processed in HandleDialCallL().
+// -----------------------------------------------------------------------------
+//
+TBool CPEMessageHandler::ExecuteKeySequenceL( const TDesC16 &aSequence )
+{
+ TBool keySequenceProcessed( EFalse );
+
+ iOptions->SetOptionStatus( KPhoneOptionInCall,
+ ( iCallHandling.GetNumberOfCalls() > 0 ) );
+ iOptions->SetOptionStatus( KPhoneOptionSend, EFalse );
+ iOptions->SetOptionStatus( KPhoneOptionVoipCall, EFalse );
+
+ if ( iParser->ParseL( aSequence, *iResult, *iOptions ) )
+ {
+ keySequenceProcessed = ETrue;
+ iGsmParserErrorCode = ECCPErrorNone;
+ iParserHandlerContainer->ProcessL( *iResult );
+ }
+
+ return keySequenceProcessed;
+}
+
+// End of File