equal
deleted
inserted
replaced
741 const RSdpResultArray& aAttr, |
741 const RSdpResultArray& aAttr, |
742 TInt aErr ) |
742 TInt aErr ) |
743 { |
743 { |
744 FLOG(_L("[BTSU]\t CBTServiceStarter::ServiceAttributeSearchComplete()")); |
744 FLOG(_L("[BTSU]\t CBTServiceStarter::ServiceAttributeSearchComplete()")); |
745 TInt err = KErrNone; |
745 TInt err = KErrNone; |
746 if (aErr==KErrEof && aAttr.Count()>0 ) |
746 if ((aErr==KErrEof || aErr==KErrNone) && aAttr.Count()>0 ) |
747 { |
747 { |
748 RSdpResultArray results=aAttr; |
748 RSdpResultArray results=aAttr; |
749 iBTEngDiscovery->ParseRfcommChannel(results,iClientChannel); |
749 iBTEngDiscovery->ParseRfcommChannel(results,iClientChannel); |
750 |
750 |
751 iBTEngDiscovery->CancelRemoteSdpQuery(); |
751 iBTEngDiscovery->CancelRemoteSdpQuery(); |
809 { |
809 { |
810 iSendToBIPOnlyDevice = ETrue; |
810 iSendToBIPOnlyDevice = ETrue; |
811 iBTEngDiscovery->RemoteProtocolChannelQuery(iDevice->BDAddr(),TUUID(KBTServiceImagingResponder)); |
811 iBTEngDiscovery->RemoteProtocolChannelQuery(iDevice->BDAddr(),TUUID(KBTServiceImagingResponder)); |
812 iState = EBTSStarterFindingBIP; |
812 iState = EBTSStarterFindingBIP; |
813 iTriedOPP = ETrue; |
813 iTriedOPP = ETrue; |
|
814 } |
|
815 else if (aErr==KErrNone && aAttr.Count()==0) |
|
816 { |
|
817 // This isn't KErrEof so we aren't done yet, wait for further matches |
814 } |
818 } |
815 else |
819 else |
816 { |
820 { |
817 // Set destroyer AO active (destroys CBTEngDiscovery/CBTEngSdpQuery classes). This is done |
821 // Set destroyer AO active (destroys CBTEngDiscovery/CBTEngSdpQuery classes). This is done |
818 // to ensure that CBTEngDiscovery/CBTEngSdpQuery classes have finished all their activities, |
822 // to ensure that CBTEngDiscovery/CBTEngSdpQuery classes have finished all their activities, |