diff -r cef4ff1e6c4f -r ef634fd8dac3 accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Fri Apr 16 16:18:45 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Mon May 03 13:42:22 2010 +0300 @@ -851,6 +851,13 @@ iServerModel->CurrentConnectionStatusL( genericIDArray ); + if( (EFalse == aAudioOutputStatus) && (KErrUnknown != aDbId) ) + { + TInt index( TAccPolGenericIDArrayAccessor::FindWithUniqueIDL( + genericIDArray, aDbId) ); + TAccPolGenericIDArrayAccessor::RemoveIndexFromGenericIDArray(genericIDArray, index); + } + accMode = iPolicy->ResolveAccessoryModeL( genericIDArray, aDbId, aAudioOutputStatus, @@ -890,27 +897,30 @@ TAccPolGenericID genericID; iServerModel->GetLastConnectedAccessoryL( genericID ); TUint32 num = genericID.SubblockCaps(); - if( num & KSBAudioSubblock ) + if ( genericID.PhysicalConnectionCaps() != KPCHDMI ) // No info note for HDMI { - CCapValue* capValue = iServerModel->CapabilityStorage().GetCapability( genericID, KAccIntegratedAudioInput ); - if( iInformationNoteDefault ) - { - noteValue = iInformationNoteDefault; - showNote = ETrue; - } - if( !capValue && !iInformationNoteDefault ) - { - showNote = ETrue; - } - } - else - { - if( iInformationNoteDefault ) - { - noteValue = iInformationNoteDefault; - showNote = ETrue; - } - } + if( num & KSBAudioSubblock ) + { + CCapValue* capValue = iServerModel->CapabilityStorage().GetCapability( genericID, KAccIntegratedAudioInput ); + if( iInformationNoteDefault ) + { + noteValue = iInformationNoteDefault; + showNote = ETrue; + } + if( !capValue && !iInformationNoteDefault ) + { + showNote = ETrue; + } + } + else + { + if( iInformationNoteDefault ) + { + noteValue = iInformationNoteDefault; + showNote = ETrue; + } + } + } } break; default: