--- a/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Wed Mar 31 23:31:40 2010 +0300
+++ b/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Wed Apr 14 17:17:45 2010 +0300
@@ -762,6 +762,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,
@@ -801,27 +808,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: