# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1282114745 -10800 # Node ID 4545c04e61e1cd7b00e02bcec7b58732aacd4d27 # Parent 0b2439c3e39794d2589f8721e94908e3e0191aa4 Revision: 201031 Kit: 201033 diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothappprofiles/avrcp/mediabrowseapi/group/bld.inf --- a/bluetoothappprofiles/avrcp/mediabrowseapi/group/bld.inf Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothappprofiles/avrcp/mediabrowseapi/group/bld.inf Wed Aug 18 09:59:05 2010 +0300 @@ -40,5 +40,5 @@ ../public/remconmediabrowsetypes.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(remconmediabrowsetypes.h) ../public/remconmediabrowsepanic.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(remconmediabrowsepanic.h) -../public/remconmediabrowsetargetbase.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(remcon/remconmediabrowsetargetbase.h) +../public/remconmediabrowsetargetbase.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(remcon/remconmediabrowsetargetbase.h) diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothappprofiles/avrcp/nowplayingapi/group/bld.inf --- a/bluetoothappprofiles/avrcp/nowplayingapi/group/bld.inf Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothappprofiles/avrcp/nowplayingapi/group/bld.inf Wed Aug 18 09:59:05 2010 +0300 @@ -30,4 +30,4 @@ ../public/remcondatabaseunawarenowplayingtarget.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(remcondatabaseunawarenowplayingtarget.h) ../public/remcondatabaseunawarenowplayingtargetobserver.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(remcondatabaseunawarenowplayingtargetobserver.h) -../public/remconnowplayingtargetbase.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(remcon/remconnowplayingtargetbase.h) +../public/remconnowplayingtargetbase.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(remcon/remconnowplayingtargetbase.h) diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothappprofiles/avrcp/remconbeareravrcp/group/remconbeareravrcp.mmp --- a/bluetoothappprofiles/avrcp/remconbeareravrcp/group/remconbeareravrcp.mmp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/group/remconbeareravrcp.mmp Wed Aug 18 09:59:05 2010 +0300 @@ -20,8 +20,6 @@ @file */ -#include "../../../../../../os/bt/bluetoothmgmt/btcommon/config.cfg" - #include TARGET remconbeareravrcp.dll diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcpplayerinfomanager.h --- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcpplayerinfomanager.h Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcpplayerinfomanager.h Wed Aug 18 09:59:05 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -88,6 +88,7 @@ void ClientStatus(TBool aControllerPresent, TBool aTargetPresent); TInt SetLocalAddressedClient(const TRemConClientId& aId); void ControllerFeaturesUpdatedL(RArray& aSupportedInterfaces); + void TargetFeaturesUpdated(const TRemConClientId& aId, TPlayerType aPlayerType, TPlayerSubType aPlayerSubType, const TDesC8& aName); MIncomingCommandHandler& InternalCommandHandler(); // Interface to command handler @@ -106,7 +107,10 @@ void MpsoPlayStatusChanged(TRemConClientId aId, MPlayerEventsObserver::TPlaybackStatus aPlaybackStatus); void MpsoError(TRemConClientId aId); - + // Helper function for ClientAvailable and TargetFeaturesUpdated + TInt SetItemDetails(TAvrcpMediaPlayerItem& aItem, TPlayerType aPlayerType, TPlayerSubType aPlayerSubType, const TDesC8& aName); + void UpdateSdpRecord(const TAvrcpMediaPlayerItem& aItem); + //--------------------------------------------------------- // Bulk thread only functions //--------------------------------------------------------- diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothappprofiles/avrcp/remconbeareravrcp/inc/controlbearer.h --- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/controlbearer.h Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/controlbearer.h Wed Aug 18 09:59:05 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -118,6 +118,8 @@ virtual TInt SetLocalAddressedClient(TRemConClientId& aId); + virtual void TargetFeaturesUpdated(const TRemConClientId& aId, TPlayerType aPlayerType, TPlayerSubType aPlayerSubType, const TDesC8& aName); + private: // from CRemConBearerPlugin TAny* GetInterface(TUid aUid); diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpincomingcommandhandler.cpp --- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpincomingcommandhandler.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpincomingcommandhandler.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -564,13 +564,13 @@ // Can ignore this as we know we have allocated a big enough buffer TRAP_IGNORE(response.WriteL(responseBuf)); + + iCommandInterface.MrccciSetAddressedClient(iClientId); break; } }; SendInternalResponse(aId, responseBuf); - iCommandInterface.MrccciSetAddressedClient(iClientId); - responseBuf.Close(); } diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpplayerinfomanager.cpp --- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpplayerinfomanager.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpplayerinfomanager.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -133,7 +133,33 @@ iUidWatcher = NULL; } -void CAvrcpPlayerInfoManager::ClientAvailable(const TRemConClientId& aId, TPlayerType aClientType, TPlayerSubType aClientSubType, const TDesC8& aName) +// Helper function for ClientAvailable and TargetFeaturesUpdated +TInt CAvrcpPlayerInfoManager::SetItemDetails(TAvrcpMediaPlayerItem& aItem, TPlayerType aPlayerType, TPlayerSubType aPlayerSubType, const TDesC8& aName) + { + aItem.iPlayerType = aPlayerType; + aItem.iPlayerSubType = aPlayerSubType; + aItem.iName.Set(aName); + aItem.iFeatureBitmask = TPlayerFeatureBitmask(); + return SetPlayerFeatures(aItem.iId, aItem.iFeatureBitmask, aItem.iSdpFeatures, aItem.iAbsoluteVolumeSupport); + } + +// Helper function for ClientAvailable and TargetFeaturesUpdated +void CAvrcpPlayerInfoManager::UpdateSdpRecord(const TAvrcpMediaPlayerItem& aItem) + { + // Update SDP record, if this fails we carry on, it's non-fatal + TInt sdpErr = KErrNone; + if(!iTargetRecord) + { + TRAP(sdpErr, AvrcpSdpUtils::CreateServiceRecordL(iSdpDatabase, iTargetRecord, ETrue, + (aItem.iSdpFeatures & AvrcpSdp::EBrowsing) ? AvrcpSdp::KAvrcpProfileVersion14 : AvrcpSdp::KAvrcpProfileVersion13)); + } + if(sdpErr == KErrNone) + { + TRAP_IGNORE(UpdateTgServiceRecordL()); + } + } + +void CAvrcpPlayerInfoManager::ClientAvailable(const TRemConClientId& aId, TPlayerType aPlayerType, TPlayerSubType aPlayerSubType, const TDesC8& aName) { LOG_FUNC; ASSERT_CONTROL_THREAD; @@ -150,15 +176,11 @@ TAvrcpMediaPlayerItem& item = iPlayers[index]; item.iId = aId; - item.iPlayerType = aClientType; - item.iPlayerSubType = aClientSubType; - item.iName.Set(aName); item.iBulkClientAvailable = EFalse; item.iUidCounter = 0; item.iLastUpdatedUidCounter = 0; item.iPlaybackStatus = MPlayerEventsObserver::EStopped; - item.iFeatureBitmask = TPlayerFeatureBitmask(); - TInt err = SetPlayerFeatures(aId, item.iFeatureBitmask, item.iSdpFeatures, item.iAbsoluteVolumeSupport); + TInt err = SetItemDetails(item, aPlayerType, aPlayerSubType, aName); // Release lock before calling out of player info manager in case // anyone needs to call back in - we're finished updating the @@ -168,41 +190,21 @@ if(!err) { TRAP(err, iPlayStatusWatcher->StartWatchingPlayerL(aId)); - if(!err) { - // Update SDP record, if this fails we carry on, it's non-fatal - TInt sdpErr = KErrNone; - if(!iTargetRecord) + UpdateSdpRecord(item); + for(TInt i = 0; iMpcoAvailablePlayersChanged(); } } - } - - if(!err) - { - for(TInt i = 0; iMpcoAvailablePlayersChanged(); + iLock.Wait(); + iPlayers[index].iId = KNullClientId; + iLock.Signal(); } } - else - { - iLock.Wait(); - iPlayers[index].iId = KNullClientId; - iLock.Signal(); - } } void CAvrcpPlayerInfoManager::ClientNotAvailable(const TRemConClientId& aId) @@ -303,6 +305,46 @@ AvrcpSdpUtils::UpdateSupportedFeaturesL(iSdpDatabase, iControllerRecord, AvrcpSdp::ERemoteControl, AvrcpSdp::KAvrcpBaseCtFeatures); } +void CAvrcpPlayerInfoManager::TargetFeaturesUpdated(const TRemConClientId& aId, TPlayerType aPlayerType, TPlayerSubType aPlayerSubType, const TDesC8& aName) + { + LOG_FUNC; + ASSERT_CONTROL_THREAD; + iLock.Wait(); + // Find this client in our client list + TInt index = iPlayers.Find(aId, PlayerCompare); + if(index < 0) + { + // Couldn't find client in client list, maybe we removed it after an earlier failure + iLock.Signal(); + return; + } + + TAvrcpMediaPlayerItem& item = iPlayers[index]; + TInt err = SetItemDetails(item, aPlayerType, aPlayerSubType, aName); + + // Release lock before calling out of player info manager in case + // anyone needs to call back in - we're finished updating the + // info now. + iLock.Signal(); + + if(!err) + { + UpdateSdpRecord(item); + } + else + { + // There was an error updating the features so remove this client from the client list + iLock.Wait(); + iPlayers[index].iId = KNullClientId; + iLock.Signal(); + } + + for(TInt i = 0; iMpcoAvailablePlayersChanged(); + } + } + MIncomingCommandHandler& CAvrcpPlayerInfoManager::InternalCommandHandler() { LOG_FUNC diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothappprofiles/avrcp/remconbeareravrcp/src/playerstatewatcher.cpp --- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/playerstatewatcher.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/playerstatewatcher.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -37,14 +37,17 @@ void CPlayerWatcherBase::StopWatchingPlayer(TRemConClientId aClientId) { LOG_FUNC; - CInternalCommand* command = *iCommands.Find(aClientId); - __ASSERT_DEBUG(command, AVRCP_PANIC(ENotWatchingPlayer)); - - TUint transId = command->RemConCommandId(); - iCommandInterface.MrcciCommandExpired(transId); - - iCommands.Remove(aClientId); - command->DecrementUsers(); + CInternalCommand** cmdPtr = iCommands.Find(aClientId); + if (cmdPtr) // This may be NULL if we've already stopped watching the player as a result of reciving a reject + { + CInternalCommand* cmd = *cmdPtr; + + TUint transId = cmd->RemConCommandId(); + iCommandInterface.MrcciCommandExpired(transId); + + iCommands.Remove(aClientId); + cmd->DecrementUsers(); + } } void CPlayerWatcherBase::MessageSent(CAvrcpCommand& /*aCommand*/, TInt /*aSendResult*/) diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothappprofiles/avrcp/remconbeareravrcp/src/remconbeareravrcp.cpp --- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/remconbeareravrcp.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/remconbeareravrcp.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -698,6 +698,19 @@ return iPlayerInfoManager->SetLocalAddressedClient(aId); } +void CRemConBearerAvrcp::TargetFeaturesUpdated(const TRemConClientId& aId, TPlayerType aPlayerType, TPlayerSubType aPlayerSubType, const TDesC8& aName) + { + LOG_FUNC + + if (!iConstructionComplete) + { + // Object only partially constructed, swallow the request + return; + } + + iPlayerInfoManager->TargetFeaturesUpdated(aId, aPlayerType, aPlayerSubType, aName); + } + void CRemConBearerAvrcp::ControllerFeaturesUpdated(RArray& aSupportedInterfaces) { LOG_FUNC diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btaudioman/inc/basrvacc.h --- a/bluetoothengine/btaudioman/inc/basrvacc.h Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btaudioman/inc/basrvacc.h Wed Aug 18 09:59:05 2010 +0300 @@ -67,6 +67,11 @@ void OpenAudioL(TAccAudioType aType); /** + * Called when the audio open request is to be cancelled. + */ + void CancelOpenAudio(); + + /** * Called when an audio close request comes from Acc FW. */ void CloseAudioL(TAccAudioType aType); diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btaudioman/inc/basrvaccstate.h --- a/bluetoothengine/btaudioman/inc/basrvaccstate.h Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btaudioman/inc/basrvaccstate.h Wed Aug 18 09:59:05 2010 +0300 @@ -102,7 +102,12 @@ * Called when an audio open request comes from Acc FW. */ virtual void OpenAudioL(TAccAudioType aType); - + + /** + * Called when the audio open request is to be cancelled. + */ + virtual void CancelOpenAudio(); + /** * Called when an audio close request comes from Acc FW. */ diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btaudioman/inc/basrvaccstateattached.h --- a/bluetoothengine/btaudioman/inc/basrvaccstateattached.h Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btaudioman/inc/basrvaccstateattached.h Wed Aug 18 09:59:05 2010 +0300 @@ -84,6 +84,12 @@ void OpenAudioL(TAccAudioType aType); /** + * Called when the audio open request is to be cancelled. + */ + void CancelOpenAudio(); + + + /** * Called when an audio close request comes from Acc FW. */ void CloseAudioL(TAccAudioType aType); diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btaudioman/src/basrvacc.cpp --- a/bluetoothengine/btaudioman/src/basrvacc.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btaudioman/src/basrvacc.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -139,6 +139,12 @@ iState->CloseAudioL(aType); } +void CBasrvAcc::CancelOpenAudio() + { + TRACE_FUNC + iState->CancelOpenAudio(); + } + const TAccInfo* CBasrvAcc::AccInfo(const TBTDevAddr& aAddr) { TRACE_FUNC diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btaudioman/src/basrvaccman.cpp --- a/bluetoothengine/btaudioman/src/basrvaccman.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btaudioman/src/basrvaccman.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -12,7 +12,7 @@ * Contributors: * * Description: Implementation of an accessory management. -* Version : %version: 14.1.11 % +* Version : %version: 14.1.12 % * */ @@ -619,27 +619,23 @@ TInt idx = FindAcc(aAddr); if (idx >= 0) { - // Check if another audio link opened already - TInt audiolinks = AudioLinkStatus(); - - if ( ( audiolinks && audiolinks != aProfile) || - ( iAudioRequests.Count() && - iAudioRequests[0].iOngoing && - iAudioRequests[0].iAddr == aAddr) ) + TInt audiolinks = AudioLinkStatus(); + if ( audiolinks && audiolinks != aProfile) { - // another audio type is opened while we have an audio link or pending audio request. - if (iAudioRequests.Count()) - { - TRACE_INFO((_L(" [audio link check] existing audio link %x, audio request pending ? %d. Audio should be rejected!"), - audiolinks, iAudioRequests[0].iOngoing)) - } - else - { - TRACE_INFO((_L(" [audio link check] existing audio link %x. Audio should be rejected!"), + TRACE_INFO((_L(" [global audio link check] existing audio link %x. Audio should be rejected!"), audiolinks)) - } RejectAudioLink(aAddr, (aProfile == EStereo) ? EAccStereoAudio : EAccMonoAudio); } + else if ( iAudioRequests.Count() && + iAudioRequests[0].iReqType == EOpenReqFromAudioPolicy && + iAudioRequests[0].iAudioType == ((aProfile == EStereo) ? EAccStereoAudio : EAccMonoAudio) && + iAudioRequests[0].iOngoing && + iAudioRequests[0].iAddr == aAddr) + { + TRACE_INFO((_L(" [device-specific audio request check] audio request pending ? %d. Audio request should be cancelled!"), + iAudioRequests[0].iOngoing)) + iAccs[idx]->CancelOpenAudio(); + } else { iAccs[idx]->AccOpenedAudio(aProfile); diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btaudioman/src/basrvaccstate.cpp --- a/bluetoothengine/btaudioman/src/basrvaccstate.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btaudioman/src/basrvaccstate.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -86,6 +86,11 @@ TRACE_FUNC } +void CBasrvAccState::CancelOpenAudio() + { + TRACE_FUNC + } + void CBasrvAccState::CloseAudioL(TAccAudioType /*aType*/) { TRACE_FUNC @@ -128,7 +133,7 @@ } void CBasrvAccState::NewProfileConnection(TProfiles aProfile) - { + { AccInfo().iConnProfiles |= aProfile; AccInfo().iSuppProfiles |= aProfile; if (aProfile == ERemConCT && diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btaudioman/src/basrvaccstateattached.cpp --- a/bluetoothengine/btaudioman/src/basrvaccstateattached.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btaudioman/src/basrvaccstateattached.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -12,7 +12,7 @@ * Contributors: * * Description: Implementation of Connected state. -* Version : %version: 21 % +* Version : %version: 22 % * */ @@ -228,6 +228,16 @@ User::RequestComplete( myStatus, KErrNone ); } +void CBasrvAccStateAttached::CancelOpenAudio() + { + TRACE_FUNC + + if (iAudioOpener) + { + iAudioOpener->Cancel(); + } + } + void CBasrvAccStateAttached::CloseAudioL(TAccAudioType aType) { TRACE_FUNC diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/bteng/bttoggle/src/bttoggle.cpp --- a/bluetoothengine/bteng/bttoggle/src/bttoggle.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/bteng/bttoggle/src/bttoggle.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -303,9 +303,9 @@ iNotifier.CancelNotifier(KBTGenericQueryNotifierUid); } else if ( EPowerModeChangeNote == iActiveNotifier ) - { - iNotifier.CancelNotifier(KBTGenericQueryNotifierUid); - } + { + iNotifier.CancelNotifier(KBTGenericInfoNotifierUid); + } // For all cancels, we must reset iActiveNotifier back to ENoneQuery // to permit another request to be made. @@ -330,8 +330,8 @@ switch (iActiveNotifier) { case EPowerModeQuery: - iActiveNotifier = ENoneQuery; - ShowNotification(ETrue); + ShowNotification(ETrue); + iActiveNotifier = EPowerModeChangeNote ; SetActive(); break; case ECloseConnectionQuery: diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/bteng/conf/CI_bteng.confml Binary file bluetoothengine/bteng/conf/CI_bteng.confml has changed diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/bteng/group/bld.inf --- a/bluetoothengine/bteng/group/bld.inf Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/bteng/group/bld.inf Wed Aug 18 09:59:05 2010 +0300 @@ -37,9 +37,6 @@ ../conf/bteng_10204DAB.crml MW_LAYER_CRML(bteng_10204DAB.crml) ../conf/bteng_10204DAC.crml MW_LAYER_CRML(bteng_10204DAC.crml) -/*remove the following exportation, when SCB CR is approved*/ -../conf/CI_bteng.confml MW_LAYER_CONFML(CI_bteng.confml) - ../data/btrfs.txt z:/resource/btrfs.txt diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/bteng/src/btengsrvsettingsmgr.cpp --- a/bluetoothengine/bteng/src/btengsrvsettingsmgr.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/bteng/src/btengsrvsettingsmgr.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -707,9 +707,10 @@ TRACE_INFO( ( _L( "[CBTEngSrvSettingsMgr]\t Using HCI API v2 power manager" ) ) ) User::LeaveIfError( iPowerMgr.Open() ); #ifndef __WINS__ - iPowerMgr.SetPower( EBTOff, NULL, iActive->RequestStatus() ); - User::WaitForRequest( iActive->RequestStatus() ); - TInt status = ( iActive->RequestStatus().Int() == KErrAlreadyExists ? KErrNone : iActive->RequestStatus().Int() ); + TRequestStatus reqStatus; + iPowerMgr.SetPower( EBTOff, NULL, reqStatus ); + User::WaitForRequest( reqStatus ); + TInt status = ( reqStatus.Int() == KErrAlreadyExists ? KErrNone : reqStatus.Int() ); User::LeaveIfError( status ); #else //__WINS__ iPowerState = EBTOff; diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btindicator/inc/btindicatorconstants.h --- a/bluetoothengine/btindicator/inc/btindicatorconstants.h Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btindicator/inc/btindicatorconstants.h Wed Aug 18 09:59:05 2010 +0300 @@ -15,8 +15,8 @@ * */ -#ifndef BTINDCONSTANTS_H -#define BTINDCONSTANTS_H +#ifndef BTINDICATORCONSTANTS_H +#define BTINDICATORCONSTANTS_H @@ -36,7 +36,7 @@ EBTIndicatorHiddenConnected }; -#endif /* BTINDCONSTANTS_H */ +#endif /* BTINDICATORCONSTANTS_H */ diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btindicator/rom/btindicator.iby --- a/bluetoothengine/btindicator/rom/btindicator.iby Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btindicator/rom/btindicator.iby Wed Aug 18 09:59:05 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btindicator/src/btindicatorplugin.cpp --- a/bluetoothengine/btindicator/src/btindicatorplugin.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btindicator/src/btindicatorplugin.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -34,9 +34,9 @@ // BTIndicatorPlugin::~BTIndicatorPlugin // ---------------------------------------------------------------------------- BTIndicatorPlugin::~BTIndicatorPlugin() - { +{ delete mIndicatorTranslator; - } +} // ---------------------------------------------------------------------------- // BTIndicatorPlugin::indicatorTypes @@ -70,10 +70,9 @@ // ---------------------------------------------------------------------------- HbIndicatorInterface* BTIndicatorPlugin::createIndicator(const QString &indicatorType) { - if(!mIndicatorTranslator) - { + if(!mIndicatorTranslator) { mIndicatorTranslator = new HbTranslator(BTINDICATOR_TRANSLATION); - } + } HbIndicatorInterface *indicator = new BTIndicator(indicatorType); return indicator; } diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btmac/inc/btmonobearer/bmbcmdlistener.h --- a/bluetoothengine/btmac/inc/btmonobearer/bmbcmdlistener.h Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btmac/inc/btmonobearer/bmbcmdlistener.h Wed Aug 18 09:59:05 2010 +0300 @@ -90,7 +90,7 @@ RProperty iATRespProperty; // At command buffer - TBuf8 iAtCmdBuf; + RBuf8 iAtCmdBuf; }; #endif diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btmac/inc/btmonocmdhandler/HfpAtCmdHandler.h --- a/bluetoothengine/btmac/inc/btmonocmdhandler/HfpAtCmdHandler.h Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btmac/inc/btmonocmdhandler/HfpAtCmdHandler.h Wed Aug 18 09:59:05 2010 +0300 @@ -133,10 +133,11 @@ MATExtObserver& iObserver; RATExt iATExtClient; - TBuf8 iCmdBuffer; - TBuf8 iRecvBuffer; - TBuf8 iReplyBuffer; - TBuf8<512> iSystemReply; + // reserve buffers from the heap + RBuf8 iCmdBuffer; + RBuf8 iSystemReply; + TBuf8 *iRecvBuffer; + TBuf8 *iReplyBuffer; TInt iRemainingReplyLength; TPckg iRemainingReplyLengthPckg; diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btmac/src/BTMonoCmdHandler/HfpAtCmdhandler.cpp --- a/bluetoothengine/btmac/src/BTMonoCmdHandler/HfpAtCmdhandler.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btmac/src/BTMonoCmdHandler/HfpAtCmdhandler.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -49,20 +49,24 @@ { iATExtClient.Close(); } + iCmdBuffer.Close(); + iSystemReply.Close(); + delete iRecvBuffer; + delete iReplyBuffer; } void CHFPAtCmdHandler::HandleCommand(const TDesC8& aAT, const TDesC8& aReply) { TRACE_INFO((_L8("default reply '%S'"), &aReply)) iCmdBuffer.Copy(aAT); - iReplyBuffer.Zero(); + iReplyBuffer->Zero(); if (aReply.Length()) { - iReplyBuffer.Copy(aReply); + iReplyBuffer->Copy(aReply); iSystemReply.Copy(aReply); - } + } iATExtClient.HandleCommand(iCommander->iStatus, - iCmdBuffer, iReplyBuffer, iRemainingReplyLengthPckg, iReplyTypePckg); + iCmdBuffer, *iReplyBuffer, iRemainingReplyLengthPckg, iReplyTypePckg); iCommander->GoActive(); } @@ -79,16 +83,16 @@ if (iRemainingReplyLengthPckg()) { TRACE_INFO((_L8("reply '%S'"), &iReplyBuffer)) - iObserver.ATExtHandleReplyReceivedL(err, iReplyBuffer); + iObserver.ATExtHandleReplyReceivedL(err, *iReplyBuffer); do { TRACE_INFO((_L8("iRemainingReplyLength '%d'"), iRemainingReplyLengthPckg())) RBuf8 reply; reply.CreateL(iRemainingReplyLengthPckg()); - err = iATExtClient.GetNextPartOfReply(iRecvBuffer, iRemainingReplyLengthPckg()); + err = iATExtClient.GetNextPartOfReply(*iRecvBuffer, iRemainingReplyLengthPckg()); if (!err) { - reply.Insert(0, iRecvBuffer); + reply.Insert(0, *iRecvBuffer); } TRACE_INFO((_L8("reply '%S'"), &reply)) iObserver.ATExtHandleReplyReceivedL(err, reply); @@ -98,8 +102,8 @@ } else { - TRACE_INFO((_L8("reply '%S'"), &iReplyBuffer)) - iObserver.ATExtHandleReplyReceivedL(err, iReplyBuffer); + TRACE_INFO((_L8("reply '%S'"), iReplyBuffer)) + iObserver.ATExtHandleReplyReceivedL(err, *iReplyBuffer); } } else @@ -159,6 +163,10 @@ StartUrc(); iCommander = CBtmcActive::NewL(*this, CActive::EPriorityStandard, EHandleCommandRequest); + iCmdBuffer.CreateL(KDefaultCmdBufLength); + iRecvBuffer = new (ELeave) TBuf8(); + iReplyBuffer = new (ELeave) TBuf8(); + iSystemReply.CreateL(KDefaultUrcBufLength); TRACE_FUNC_EXIT } diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btmac/src/BTMonoCmdHandler/btmccallinghandler.cpp --- a/bluetoothengine/btmac/src/BTMonoCmdHandler/btmccallinghandler.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btmac/src/BTMonoCmdHandler/btmccallinghandler.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -94,13 +94,15 @@ TInt result = KErrNone; if (!aErr) { - TBuf8 buf; + RBuf8 buf; + buf.CreateL(KDefaultCmdBufLength); aErr = iRespProperty.Get(buf); if (!aErr && buf.Length() >= sizeof(TInt)) { const TUint8* ptr = buf.Ptr(); result = *((const TInt*)ptr); } + buf.Close(); } TRACE_INFO((_L("resp %d"), result)) TATId atid = EATOK; diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btmac/src/BTMonoCmdHandler/btmcprotocol.cpp --- a/bluetoothengine/btmac/src/BTMonoCmdHandler/btmcprotocol.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btmac/src/BTMonoCmdHandler/btmcprotocol.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -399,21 +399,23 @@ { return; } - TBuf8 cmddes; - if (iInDataBuf.NextCommand(cmddes)) + RBuf8 cmddes; + cmddes.CreateL(KDefaultCmdBufLength); + CleanupClosePushL(cmddes); + if (iInDataBuf.NextCommand(cmddes) || cmddes.Length() == 0) { + CleanupStack::PopAndDestroy(&cmddes); return; } - if (cmddes.Length() == 0) - { - return; - } + TRACE_INFO_SEG( { - TBuf8 buf; + RBuf8 buf; + buf.CreateL(KDefaultCmdBufLength); buf = cmddes; buf.Trim(); Trace(_L8("[HFP] [I] %S"), &buf); + buf.Close(); }) CATCommand* cmd = NULL; @@ -423,13 +425,16 @@ if(iAtExt) { iAtExt->HandleCommand(cmddes, _L8("\n\rERROR\n\r")); + CleanupStack::PopAndDestroy(&cmddes); return; } CATResult* nok = CATResult::NewLC(EATERROR); SendResponseL(*nok); CleanupStack::PopAndDestroy(nok); + CleanupStack::PopAndDestroy(&cmddes); return; } + CleanupStack::PopAndDestroy(&cmddes); CleanupStack::PushL(cmd); iHandleCmdPending = ETrue; TATId id = cmd->Id(); @@ -1080,14 +1085,17 @@ { TRACE_INFO((_L("credit %d"), iCredit)) TInt count = iOutgoPacketQueue->MdcaCount(); + RBuf8 buf; + buf.CreateL(KDefaultCmdBufLength); + CleanupClosePushL(buf); for (TInt i = 0; iCredit >0 && i < count; i++) { iCredit--; - TBuf8 buf; buf.Copy(iOutgoPacketQueue->MdcaPoint(0)); iObserver.SendProtocolDataL(buf); iOutgoPacketQueue->Delete(0); } + CleanupStack::PopAndDestroy(&buf); } void CBtmcProtocol::StartTimerL(TInt aService, TInt aTimeout) diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btmac/src/btmac/btmpagescanparametersmanager.cpp --- a/bluetoothengine/btmac/src/btmac/btmpagescanparametersmanager.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btmac/src/btmac/btmpagescanparametersmanager.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -71,6 +71,7 @@ KPageScanParametersListenerService); iTimerActive = CBtmActive::NewL(*this, CActive::EPriorityStandard, KFastConnectionService); + LEAVE_IF_ERROR(iTimer.CreateLocal()); TRACE_FUNC_EXIT } @@ -89,7 +90,6 @@ if (!iTimerActive->IsActive()) { TRACE_FUNC_ENTRY - iTimer.CreateLocal(); iTimer.After(iTimerActive->iStatus, aTimeout); iTimerActive->SetRequestId(aService); iTimerActive->GoActive(); @@ -107,7 +107,6 @@ { TRACE_FUNC_ENTRY iTimerActive->Cancel(); - iTimer.Close(); TRACE_FUNC_EXIT } } diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btmac/src/btmonobearer/bmbcmdlistener.cpp --- a/bluetoothengine/btmac/src/btmonobearer/bmbcmdlistener.cpp Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btmac/src/btmonobearer/bmbcmdlistener.cpp Wed Aug 18 09:59:05 2010 +0300 @@ -35,6 +35,7 @@ Cancel(); iATCmdProperty.Close(); iATRespProperty.Close(); + iAtCmdBuf.Close(); } // --------------------------------------------------------------------------- @@ -60,6 +61,7 @@ TRACE_FUNC LEAVE_IF_ERROR(iATCmdProperty.Attach(KPSUidBluetoothEnginePrivateCategory, KBTHfpATCommand)); LEAVE_IF_ERROR(iATRespProperty.Attach(KPSUidBluetoothEnginePrivateCategory, KBTHfpATResponse)); + iAtCmdBuf.CreateL(KDefaultCmdBufLength); Subscribe(); } diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btnotif/btdevicedialogplugin/btdevicedialogplugin.pro --- a/bluetoothengine/btnotif/btdevicedialogplugin/btdevicedialogplugin.pro Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btnotif/btdevicedialogplugin/btdevicedialogplugin.pro Wed Aug 18 09:59:05 2010 +0300 @@ -35,7 +35,8 @@ inc/btsenddialogwidget.h \ inc/btdevicedialogplugintrace.h \ inc/btdevicedialogrecvquerywidget.h \ - inc/btrecvprgrsdialogwidget.h + inc/btrecvprgrsdialogwidget.h \ + inc/btrecvcompleteddialogwidget.h SOURCES += src/btdevicedialogplugin.cpp \ @@ -46,7 +47,8 @@ src/btmoredevicesdialogwidget.cpp \ src/btsenddialogwidget.cpp \ src/btdevicedialogrecvquerywidget.cpp \ - src/btrecvprgrsdialogwidget.cpp + src/btrecvprgrsdialogwidget.cpp \ + src/btrecvcompleteddialogwidget.cpp RESOURCES += btdevicedialogplugin.qrc @@ -56,7 +58,10 @@ TARGET.CAPABILITY = CAP_GENERAL_DLL TARGET.UID3 = 0x2002E6DF - LIBS += -lbtdevice + LIBS += -lbtdevice \ + -lhbcore \ + -lxqservice \ + -lxqserviceutil \ hblib.sources = Hb.dll hblib.path = \sys\bin diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btnotif/btdevicedialogplugin/btdevicedialogplugin.qrc --- a/bluetoothengine/btnotif/btdevicedialogplugin/btdevicedialogplugin.qrc Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btnotif/btdevicedialogplugin/btdevicedialogplugin.qrc Wed Aug 18 09:59:05 2010 +0300 @@ -7,5 +7,6 @@ icons/qtg_large_bluetooth.svg docml/bt-receive-auth-dialog.docml docml/bt-recv-progress-dialog.docml + docml/bt-receive-done-dialog.docml diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-device-search-dialog.docml --- a/bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-device-search-dialog.docml Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-device-search-dialog.docml Wed Aug 18 09:59:05 2010 +0300 @@ -1,13 +1,19 @@

- + + + + @@ -40,15 +46,16 @@ - + + - + diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-more-devices-dialog.docml --- a/bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-more-devices-dialog.docml Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-more-devices-dialog.docml Wed Aug 18 09:59:05 2010 +0300 @@ -3,10 +3,11 @@

diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-receive-done-dialog.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-receive-done-dialog.docml Wed Aug 18 09:59:05 2010 +0300 @@ -0,0 +1,63 @@ + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 0b2439c3e397 -r 4545c04e61e1 bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-send-dialog.docml --- a/bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-send-dialog.docml Tue Jul 06 14:27:09 2010 +0300 +++ b/bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-send-dialog.docml Wed Aug 18 09:59:05 2010 +0300 @@ -1,6 +1,7 @@