diff -r c84cf270c54f -r 8871b09be73b phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp Tue Feb 02 00:10:04 2010 +0200 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp Fri Feb 19 22:50:26 2010 +0200 @@ -34,7 +34,7 @@ #include "phoneui.hrh" #include "mphonestorage.h" #include "cphonecenrepproxy.h" -#include +#include // ================= MEMBER FUNCTIONS ======================= @@ -57,13 +57,15 @@ // CPhoneConferenceAndSingleAndWaiting::~CPhoneConferenceAndSingleAndWaiting() { - // Reset flag + // Need to check iViewCommandHandle validity here to not + // trigger a high/can panic error in a Codescanner run. + // coverity[var_compare_op] if ( iViewCommandHandle ) { TPhoneCmdParamBoolean dtmfSendFlag; dtmfSendFlag.SetBoolean( EFalse ); - iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, - &dtmfSendFlag ); + TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, + &dtmfSendFlag ) ); } } @@ -437,6 +439,28 @@ } // ----------------------------------------------------------- +// CPhoneConferenceAndSingleAndWaiting::HandleErrorL +// ----------------------------------------------------------- +// +EXPORT_C void CPhoneConferenceAndSingleAndWaiting::HandleErrorL( + const TPEErrorInfo& aErrorInfo ) + { + __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingleAndWaiting::HandleErrorL()"); + + if( aErrorInfo.iErrorCode == ECCPErrorCCUserAlertingNoAnswer ) + { + // Should not shown "No Answer" note + __PHONELOG1( EBasic, EPhoneUIStates, + "PhoneUIStates: CPhoneConferenceAndSingleAndWaiting::HandleErrorL - aErrorInfo.iErrorCode =%d ", + aErrorInfo.iErrorCode); + } + else + { + CPhoneState::HandleErrorL( aErrorInfo ); + } + } + +// ----------------------------------------------------------- // CPhoneConferenceAndSingleAndWaiting::UpdateInCallCbaL // ----------------------------------------------------------- //