--- a/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Tue Jan 26 11:57:27 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Tue Feb 02 00:10:04 2010 +0200
@@ -265,10 +265,14 @@
case EKeyApplication0:
{
+ // Security mode
+ TPhoneCmdParamBoolean isSecurityMode;
+ iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
+
// If dialer is not open but phone is in foreground and phone receives
- // applicaion-key event we have to open emergency dialer. No need own
- // securitymode check because Applicationkey only captured in securitymode.
- if ( !IsNumberEntryUsedL() )
+ // applicaion-key event we have to open emergency dialer.
+ // Securitymode check because Applicationkey only open dialer in securitymode.
+ if ( isSecurityMode.Boolean() && !IsNumberEntryUsedL() )
{
HandleCommandL(EPhoneNumberAcqSecurityDialer);
}
--- a/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp Tue Jan 26 11:57:27 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp Tue Feb 02 00:10:04 2010 +0200
@@ -140,7 +140,11 @@
iStateMachine.SendPhoneEngineMessage(
MPEPhoneModel::EPEMessageDoUnattendedTransfer );
- ShowWaitingAcceptanceNoteL();
+ if ( KErrNone == iStateMachine.PhoneEngineInfo()->
+ ErrorInfo().iErrorCode )
+ {
+ ShowWaitingAcceptanceNoteL();
+ }
}
break;
@@ -259,7 +263,10 @@
iStateMachine.SendPhoneEngineMessage(
MPEPhoneModel::EPEMessageDoUnattendedTransfer );
- ShowWaitingAcceptanceNoteL();
+ if ( KErrNone == iStateMachine.PhoneEngineInfo()->ErrorInfo().iErrorCode )
+ {
+ ShowWaitingAcceptanceNoteL();
+ }
CleanupStack::PopAndDestroy( content );
}
--- a/phoneengine/phonemodel/src/cpemessagehandler.cpp Tue Jan 26 11:57:27 2010 +0200
+++ b/phoneengine/phonemodel/src/cpemessagehandler.cpp Tue Feb 02 00:10:04 2010 +0200
@@ -2931,6 +2931,8 @@
TInt errorCode = iCallHandling.DoUnattendedTransfer(
iDataStore.TransferTargetCommand() );
+ iDataStore.SetErrorCode( errorCode );
+
return errorCode;
}