diff -r 2a26698d78ba -r 38529f706030 phoneapp/phoneuicontrol/src/cphonestateincoming.cpp --- a/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Mon Mar 15 12:40:24 2010 +0200 +++ b/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Wed Mar 31 21:30:06 2010 +0300 @@ -54,6 +54,7 @@ #include "cphonemediatorsender.h" #include "cphonereleasecommand.h" #include "mphonecustomization.h" +#include "mphonesecuritymodeobserver.h" // ================= MEMBER FUNCTIONS ======================= @@ -413,6 +414,11 @@ { resourceId = EPhoneNumberAcqCBA; } + else if ( iStateMachine->SecurityMode()->IsSecurityMode() ) + { + // Use 'answer & reject' softkeys if security mode is enabled. + resourceId = EPhoneCallHandlingIncomingRejectCBA; + } else if ( softRejectParam.Boolean() ) { resourceId = EPhoneCallHandlingIncomingSoftRejectCBA;