diff -r 95754dcd27ad -r ce86b6d44a6d mmsharing/mmshengine/src/musengtelephoneutils.cpp --- a/mmsharing/mmshengine/src/musengtelephoneutils.cpp Tue May 25 12:38:39 2010 +0300 +++ b/mmsharing/mmshengine/src/musengtelephoneutils.cpp Wed Jun 09 09:37:52 2010 +0300 @@ -100,8 +100,6 @@ TBool retValue = ( iTelephonyAudioRouting->Output() != CTelephonyAudioRouting::EWiredAudioAccessory && iTelephonyAudioRouting->Output() != - CTelephonyAudioRouting::EBTAudioAccessory && - iTelephonyAudioRouting->Output() != CTelephonyAudioRouting::ETTY ); MUS_LOG1( "mus: [ENGINE] <- CMusEngTelephoneUtils::AudioRoutingCanBeChanged: %d", @@ -123,7 +121,9 @@ if ( aEnable ) { if ( iTelephonyAudioRouting->Output() == - CTelephonyAudioRouting::EHandset ) + CTelephonyAudioRouting::EHandset || + iTelephonyAudioRouting->Output() == + CTelephonyAudioRouting::EBTAudioAccessory ) { // Disable note shown by audiorouting api as it causes // application going to background for a while. Instead, display @@ -304,6 +304,22 @@ MUS_LOG( "mus: [ENGINE] <- CMusEngTelephoneUtils::RunL()" ) } +// ------------------------------------------------------------------------- +// If RunL() leaves,It should be handled here. +// ------------------------------------------------------------------------- +// +TInt CMusEngTelephoneUtils::RunError( TInt aError ) + { + MUS_LOG1( "mus: [ENGINE] -> CMusEngTelephoneUtils::\ + RunError() return #%d", aError ) + + // Nothing can be done here. + aError = KErrNone; + + MUS_LOG( "mus: [ENGINE] <- CMusEngTelephoneUtils::RunError()" ) + return aError; + } + // ----------------------------------------------------------------------------- //