--- a/bluetoothappprofiles/avrcp/mediabrowseapi/group/bld.inf	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/mediabrowseapi/group/bld.inf	Mon Jul 12 18:51: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_PLATFORM_EXPORT_PATH(remcon/remconmediabrowsetargetbase.h)
+../public/remconmediabrowsetargetbase.h	SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(remcon/remconmediabrowsetargetbase.h)
 

--- a/bluetoothappprofiles/avrcp/nowplayingapi/group/bld.inf	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/nowplayingapi/group/bld.inf	Mon Jul 12 18:51: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_PLATFORM_EXPORT_PATH(remcon/remconnowplayingtargetbase.h)
+../public/remconnowplayingtargetbase.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(remcon/remconnowplayingtargetbase.h)

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcpincomingcommandhandler.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcpincomingcommandhandler.h	Mon Jul 12 18:51:05 2010 +0300
@@ -32,13 +32,13 @@
 
 class CPassthroughHelper;
 class CRcpRouter;
-class CRemConBearerAvrcp;
+class MRemConControlCommandInterface;
 class CAVCFrame;
 class TBTDevAddr;
 NONSHARABLE_CLASS(CRcpIncomingCommandHandler) : public CBase, public MPlayerChangeObserver, public MIncomingCommandHandler
 	{
 public:
-	static CRcpIncomingCommandHandler* NewL(CRemConBearerAvrcp& aBearer, 
+	static CRcpIncomingCommandHandler* NewL(MRemConControlCommandInterface& aCommandInterface, 
 		MRemConBearerObserver& aObserver,
 		CRcpRouter& aRouter,
 		CDeltaTimer& aTimer,
@@ -59,7 +59,7 @@
 	void SendReject(TUid aInterfaceUid, TUint aId);
 
 private:
-	CRcpIncomingCommandHandler(CRemConBearerAvrcp& aBearer, 
+	CRcpIncomingCommandHandler(MRemConControlCommandInterface& aCommandInterface, 
 		MRemConBearerObserver& aObserver,
 		CRcpRouter& aRouter,
 		CDeltaTimer& aTimer,
@@ -92,6 +92,8 @@
 
 	void SendInternalResponse(TUint aId, RBuf8& aData);
 	void SendResponse(TDblQue<CControlCommand>& aCommandQueue, TUint aId, RBuf8& aData);
+	
+	void EnterAddressedMode();
 
 	// Timer functions
 	TBool DuplicateNotify(TDblQue<CControlCommand>& aCommandQueue, const CControlCommand& aCommand) const;
@@ -100,15 +102,15 @@
 	TDblQue<CControlCommand>	iCommandQueue;
 	TDblQue<CControlCommand>	iInternalCommandQueue;
 	
-	CAVRCPFragmenter*		iFragmenter;
-	CRemConBearerAvrcp&		iBearer;
-	MRemConBearerObserver&	iObserver;
-	CRcpRouter&				iRouter;
-	CDeltaTimer& 			iTimer;
-	TRemConClientId			iClientId; // We store the client id even if we aren't
-									   // in addressed mode as we may switch into
-									   // it and need to know the current local
-									   // addressed player
+	CAVRCPFragmenter*					iFragmenter;
+	MRemConControlCommandInterface&		iCommandInterface;
+	MRemConBearerObserver&				iObserver;
+	CRcpRouter&							iRouter;
+	CDeltaTimer& 						iTimer;
+	TRemConClientId						iClientId;	// We store the client id even if we aren't
+													// in addressed mode as we may switch into
+													// it and need to know the current local
+													// addressed player
 	TBool					iAddressedMode;
 	
 	CAvrcpPlayerInfoManager&	iPlayerInfoManager;

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcpoutgoingcommandhandler.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcpoutgoingcommandhandler.h	Mon Jul 12 18:51:05 2010 +0300
@@ -30,13 +30,13 @@
 
 class CControlCommand;
 class CRcpRouter;
-class CRemConBearerAvrcp;
+class MRemConControlCommandInterface;
 class MRemConBearerObserver;
 NONSHARABLE_CLASS(CRcpOutgoingCommandHandler) : public CBase, public MOutgoingCommandHandler
 	{
 public:
 	// Construction/Destruction
-	static CRcpOutgoingCommandHandler* NewL(CRemConBearerAvrcp& aBearer, 
+	static CRcpOutgoingCommandHandler* NewL(MRemConControlCommandInterface& aCommandInterface, 
 		MRemConBearerObserver& aObserver,
 		CRcpRouter& aRouter,
 		CDeltaTimer& aTimer);
@@ -68,7 +68,7 @@
 			const TBTDevAddr& aAddr);
 
 private:
-	CRcpOutgoingCommandHandler(CRemConBearerAvrcp& aBearer, 
+	CRcpOutgoingCommandHandler(MRemConControlCommandInterface& aCommandInterface, 
 		MRemConBearerObserver& aObserver,
 		CRcpRouter& aRouter,
 		CDeltaTimer& aTimer);
@@ -105,14 +105,14 @@
 								CControlCommand* aCommand, 
 								TBool aNotify);
 private:
-	TTransactionLabel		iCurrentTrans;
+	TTransactionLabel			iCurrentTrans;
 	TDblQue<CControlCommand>	iCommandQueue;
 	TDblQue<CControlCommand>	iNotifyCommandQueue;
 	
-	CRemConBearerAvrcp&		iBearer;
-	MRemConBearerObserver&	iObserver;
-	CRcpRouter&				iRouter;
-	CDeltaTimer&			iTimer;
+	MRemConControlCommandInterface& iCommandInterface;
+	MRemConBearerObserver&			iObserver;
+	CRcpRouter&						iRouter;
+	CDeltaTimer&					iTimer;
 	
 	CControlCommand*			iUnreleasedCommand;
 	TBool					iUnreleasedHasResponse;

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcpremotedevice.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcpremotedevice.h	Mon Jul 12 18:51:05 2010 +0300
@@ -24,7 +24,7 @@
 
 #include <e32std.h>
 
-class CRemConBearerAvrcp;
+class MRemConControlCommandInterface;
 class MIncomingCommandHandler;
 class MOutgoingCommandHandler;
 class CRcpIncomingCommandHandler;
@@ -41,7 +41,7 @@
 public:
 	static CRcpRemoteDevice* NewL(const TBTDevAddr& aAddr,
 		CRcpRouter& aRouter, 
-		CRemConBearerAvrcp& aBearer,
+		MRemConControlCommandInterface& aCommandInterface,
 		MRemConBearerObserver& aObserver,
 		CDeltaTimer& aTimer,
 		CAvrcpPlayerInfoManager& aPlayerInfoManager);
@@ -58,7 +58,7 @@
 private:
 	CRcpRemoteDevice(const TBTDevAddr& aAddr,
 		CRcpRouter& aRouter, 
-		CRemConBearerAvrcp& aBearer,
+		MRemConControlCommandInterface& aCommandInterface,
 		CDeltaTimer& aTimer);
 		
 	void ConstructL(MRemConBearerObserver& aObserver,
@@ -73,7 +73,7 @@
 	CRcpOutgoingCommandHandler*		iOutgoing;
 
 	CRcpRouter&						iRouter;
-	CRemConBearerAvrcp&				iBearer;
+	MRemConControlCommandInterface& iCommandInterface;
 	CDeltaTimer&					iTimer;
 	};
 

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcputils.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcputils.h	Mon Jul 12 18:51:05 2010 +0300
@@ -80,6 +80,8 @@
 	ECommandAlreadyQueuedForSending = 52,
 	EPassthroughQueueNotEmptyAfterDisconnect = 53,
 	EPreviousPassthroughNonNullReplacing = 54,
+	ETooManyRemotesRegisterForLocalAddressedPlayerUpdates = 55,
+	ETooFewRemotesRegisterForLocalAddressedPlayerUpdates = 56,
 	};
 
 template <typename XAny>

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/controlbearer.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/controlbearer.h	Mon Jul 12 18:51:05 2010 +0300
@@ -62,6 +62,8 @@
     void MrcciCommandExpired(TUint aTransactionId);
     
 	void MrccciSetAddressedClient(const TRemConClientId& aClient);
+	void MrccciRegisterForLocalAddressedClientUpdates();
+	void MrccciUnregisterForLocalAddressedClientUpdates();
 
 private: // MRemConBearerInterfaceV3 functions called from RemCon
 	virtual TInt GetResponse(TUid& aInterfaceUid, 
@@ -184,6 +186,8 @@
 	CAvrcpBulkBearer*			iBulkBearer;
 	
 	RAvctp						iAvctp;
+	
+	TInt						iRemotesInterestedInLocalAddressedClient;
 	};
 
 #endif //CONTROLBEARER_H

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/passthroughhelper.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/passthroughhelper.h	Mon Jul 12 18:51:05 2010 +0300
@@ -19,19 +19,19 @@
 #include <e32base.h>
 
 class CRcpRouter;
-class CRemConBearerAvrcp;
+class MRemConControlCommandInterface;
 class CControlCommand;
 NONSHARABLE_CLASS(CPassthroughHelper) : public CBase
 	{
 public:
-	static CPassthroughHelper* NewL(CRcpRouter& aRouter, CRemConBearerAvrcp& aBearer, CDeltaTimer& aTimer);
+	static CPassthroughHelper* NewL(CRcpRouter& aRouter, MRemConControlCommandInterface& aCommandInterface, CDeltaTimer& aTimer);
 	~CPassthroughHelper();
 	
 	void Disconnect();
 	
 	void HandlePassthrough(CControlCommand& aCommand); // FIXME for now
 private:
-	CPassthroughHelper(CRcpRouter& aRouter, CRemConBearerAvrcp& aAvrcp, CDeltaTimer& aTimer);
+	CPassthroughHelper(CRcpRouter& aRouter, MRemConControlCommandInterface& aCommandInterface, CDeltaTimer& aTimer);
 	void ConstructL();
 	
 	void Respond(CControlCommand& aCommand, TInt aErr);
@@ -52,7 +52,7 @@
 
 private:
 	CRcpRouter& iRouter;
-	CRemConBearerAvrcp& iBearer;
+	MRemConControlCommandInterface& iCommandInterface;
 	CDeltaTimer& iTimer;
 	CControlCommand* iPreviousPassthrough;
 	};

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/remconcommandinterface.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/remconcommandinterface.h	Mon Jul 12 18:51:05 2010 +0300
@@ -51,7 +51,8 @@
 	virtual void MrccciNewNotifyResponse(CControlCommand& aCommand) = 0;
 	
 	virtual void MrccciSetAddressedClient(const TRemConClientId& aClient) = 0;
-
+	virtual void MrccciRegisterForLocalAddressedClientUpdates() = 0;
+	virtual void MrccciUnregisterForLocalAddressedClientUpdates() = 0;
 	};
 
 #endif //REMCONCOMMANDINTERFACE_H

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpMetadataTransfer.cpp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpMetadataTransfer.cpp	Mon Jul 12 18:51:05 2010 +0300
@@ -901,11 +901,16 @@
 			eventsBuf.Append(ERegisterNotificationUidsChanged );
 			}
 		
-		// Always mark support for stuff that's handled internally rather than
-		// by the player
-		count+= 2;
-		eventsBuf.Append(ERegisterNotificationAvailablePlayersChanged );
-		eventsBuf.Append(ERegisterNotificationAddressedPlayerChanged );
+		// If there are any browsing clients then mark support for the player addressing
+		// events.  Without browsing support the remote will not be able to see the 
+		// information about the players so it is better not to let them see events
+		// relating to the them
+		if(iPlayerInfoManager->BrowsingSupportedL(KNullClientId))
+			{
+			count+= 2;
+			eventsBuf.Append(ERegisterNotificationAvailablePlayersChanged );
+			eventsBuf.Append(ERegisterNotificationAddressedPlayerChanged );
+			}
 		
 		responseData[1] += count;
 

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpincomingcommandhandler.cpp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpincomingcommandhandler.cpp	Mon Jul 12 18:51:05 2010 +0300
@@ -54,7 +54,7 @@
 @return A fully constructed CRcpIncomingCommandHandler.
 @leave System wide error codes.
 */
-CRcpIncomingCommandHandler* CRcpIncomingCommandHandler::NewL(CRemConBearerAvrcp& aBearer,
+CRcpIncomingCommandHandler* CRcpIncomingCommandHandler::NewL(MRemConControlCommandInterface& aCommandInterface,
 	MRemConBearerObserver& aObserver,
 	CRcpRouter& aRouter,
 	CDeltaTimer& aTimer,
@@ -62,7 +62,7 @@
 	TBTDevAddr& aDevice) 
 	{
 	LOG_STATIC_FUNC
-	CRcpIncomingCommandHandler* handler = new(ELeave)CRcpIncomingCommandHandler(aBearer, aObserver, aRouter, aTimer, aPlayerInfoManager, aDevice);
+	CRcpIncomingCommandHandler* handler = new(ELeave)CRcpIncomingCommandHandler(aCommandInterface, aObserver, aRouter, aTimer, aPlayerInfoManager, aDevice);
 	CleanupStack::PushL(handler);
 	handler->ConstructL();
 	CleanupStack::Pop(handler);
@@ -78,7 +78,7 @@
 @return A partially constructed CRcpIncomingCommandHandler.
 @leave System wide error codes.
 */	
-CRcpIncomingCommandHandler::CRcpIncomingCommandHandler(CRemConBearerAvrcp& aBearer, 
+CRcpIncomingCommandHandler::CRcpIncomingCommandHandler(MRemConControlCommandInterface& aCommandInterface, 
 	MRemConBearerObserver& aObserver,
 	CRcpRouter& aRouter,
 	CDeltaTimer& aTimer,
@@ -87,7 +87,7 @@
 	: iCommandQueue(_FOFF(CControlCommand, iHandlingLink))
 	, iInternalCommandQueue(_FOFF(CControlCommand, iHandlingLink))
 	, iFragmenter(NULL)
-	, iBearer(aBearer)
+	, iCommandInterface(aCommandInterface)
 	, iObserver(aObserver)
 	, iRouter(aRouter)
 	, iTimer(aTimer)
@@ -121,7 +121,7 @@
 	
 	CleanupStack::PopAndDestroy(&players);
 	
-	iPassthroughHelper = CPassthroughHelper::NewL(iRouter, iBearer, iTimer);
+	iPassthroughHelper = CPassthroughHelper::NewL(iRouter, iCommandInterface, iTimer);
 	}
 
 /** Destructor.
@@ -130,6 +130,7 @@
 	{
 	LOG_FUNC
 
+	iCommandInterface.MrccciUnregisterForLocalAddressedClientUpdates();
 	iPlayerInfoManager.RemoveObserver( *this );
 	delete iFragmenter;
 	delete iPassthroughHelper;
@@ -207,7 +208,7 @@
 	{
 	LOG_FUNC
 		
-	TUint id = iBearer.MrcciNewTransactionId();
+	TUint id = iCommandInterface.MrcciNewTransactionId();
 	
 	// If there's nothing beyond a header this is bobs.  Dump it now.
 	if(aMessageInformation.Length() <= KAVCFrameHeaderLength)
@@ -508,11 +509,11 @@
 		// can go directly to client (unlike passthrough which may need to map 2 commands to 1 click
 		if (aCommand.Frame().Type() == AVC::ENotify)
 			{
-			iBearer.MrccciNewNotifyCommand(aCommand, aCommand.ClientId());
+			iCommandInterface.MrccciNewNotifyCommand(aCommand, aCommand.ClientId());
 			}
 		else
 			{
-			iBearer.MrcciNewCommand(aCommand, aCommand.ClientId());
+			iCommandInterface.MrcciNewCommand(aCommand, aCommand.ClientId());
 			}
 		}
 	}
@@ -522,7 +523,7 @@
 	LOG_FUNC
 	
 	// Once we respond to this we've told the remote that we're using a particular player
-	iAddressedMode = ETrue;
+	EnterAddressedMode();
 	
 	// SetAddressedPlayer involves not just responding to this command but
 	// also rejecting a bunch of notifies and completing the addressed player
@@ -568,7 +569,7 @@
 			};
 	
 		SendInternalResponse(aId, responseBuf);
-		iBearer.MrccciSetAddressedClient(iClientId);
+		iCommandInterface.MrccciSetAddressedClient(iClientId);
 	
 		responseBuf.Close();
 		}
@@ -662,7 +663,7 @@
 	LOG_FUNC
 
 	// Once we respond to this we've told the remote that we're using a particular player
-	iAddressedMode = ETrue;
+	EnterAddressedMode();
 	
 	RBuf8 responseBuf;
 	TRAPD(err, DoHandleRegisterAddressedPlayerNotificationL(responseBuf, aCommand));
@@ -720,7 +721,7 @@
 
 	// Although we haven't strictly told the remote which player we're using this is 
 	// a 1.4 command, and implies use of a specific player so switch into addressed mode
-	iAddressedMode = ETrue;
+	EnterAddressedMode();
 
 	RBuf8 responseBuf;
 	TUint16 uidCounter = 0;
@@ -823,6 +824,12 @@
 	aData.Close();
 	}
 
+void CRcpIncomingCommandHandler::EnterAddressedMode()
+	{
+	iAddressedMode = ETrue;
+	iCommandInterface.MrccciRegisterForLocalAddressedClientUpdates();
+	}
+
 TBool CRcpIncomingCommandHandler::DuplicateNotify(TDblQue<CControlCommand>& aCommandQueue, const CControlCommand& aCommand) const
 	{
 	TUid interfaceUid = aCommand.RemConInterfaceUid();

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpoutgoingcommandhandler.cpp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpoutgoingcommandhandler.cpp	Mon Jul 12 18:51:05 2010 +0300
@@ -45,13 +45,13 @@
 @return A fully constructed CRcpOutgoingCommandHandler.
 @leave System wide error codes.
 */
-CRcpOutgoingCommandHandler* CRcpOutgoingCommandHandler::NewL(CRemConBearerAvrcp& aBearer, 
+CRcpOutgoingCommandHandler* CRcpOutgoingCommandHandler::NewL(MRemConControlCommandInterface& aCommandInterface, 
 	MRemConBearerObserver& aObserver,
 	CRcpRouter& aRouter,
 	CDeltaTimer& aTimer)
 	{
 	LOG_STATIC_FUNC
-	CRcpOutgoingCommandHandler* handler = new(ELeave)CRcpOutgoingCommandHandler(aBearer, aObserver, aRouter, aTimer);
+	CRcpOutgoingCommandHandler* handler = new(ELeave)CRcpOutgoingCommandHandler(aCommandInterface, aObserver, aRouter, aTimer);
 	return handler;
 	}
 
@@ -64,12 +64,12 @@
 @return A partially constructed CRcpIncomingCommandHandler.
 @leave System wide error codes.
 */		
-CRcpOutgoingCommandHandler::CRcpOutgoingCommandHandler(CRemConBearerAvrcp& aBearer, 
+CRcpOutgoingCommandHandler::CRcpOutgoingCommandHandler(MRemConControlCommandInterface& aCommandInterface, 
 	MRemConBearerObserver& aObserver,
 	CRcpRouter& aRouter,
 	CDeltaTimer& aTimer) : iCommandQueue(_FOFF(CControlCommand, iHandlingLink)),
 	iNotifyCommandQueue(_FOFF(CControlCommand, iHandlingLink)),
-	iBearer(aBearer), iObserver(aObserver), iRouter(aRouter), iTimer(aTimer)
+	iCommandInterface(aCommandInterface), iObserver(aObserver), iRouter(aRouter), iTimer(aTimer)
 	{
 	LOG_FUNC
 	}
@@ -281,11 +281,11 @@
 		
 		if ( aNotify )
 		    {//This is a notify command
-		    iBearer.MrccciNewNotifyResponse(*aCommand);
+		    iCommandInterface.MrccciNewNotifyResponse(*aCommand);
 		    }
 		else
 			{
-			iBearer.MrccciNewResponse(*aCommand);
+			iCommandInterface.MrccciNewResponse(*aCommand);
 			}
 		}
 
@@ -331,7 +331,7 @@
 		if(command)
 			{
 			command->SetNotifyVolumeChangeResult(command->Frame());
-			iBearer.MrccciNewNotifyResponse(*command);
+			iCommandInterface.MrccciNewNotifyResponse(*command);
 			}
 		else
 			{
@@ -353,7 +353,7 @@
 					}
 				}
 			
-			iBearer.MrccciNewResponse(*command);
+			iCommandInterface.MrccciNewResponse(*command);
 			}
 		
 		command->iHandlingLink.Deque();
@@ -578,7 +578,7 @@
 				aCommand.SetCoreButtonAction(ERemConCoreApiButtonRelease, ETrue);
 				}
 
-			iBearer.MrccciNewResponse(aCommand);
+			iCommandInterface.MrccciNewResponse(aCommand);
            }
 		}	
 	}

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpremotedevice.cpp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpremotedevice.cpp	Mon Jul 12 18:51:05 2010 +0300
@@ -31,13 +31,13 @@
 */
 CRcpRemoteDevice* CRcpRemoteDevice::NewL(const TBTDevAddr& aAddr, 
 	CRcpRouter& aRouter, 
-	CRemConBearerAvrcp& aBearer,
+	MRemConControlCommandInterface& aCommandInterface,
 	MRemConBearerObserver& aObserver,
 	CDeltaTimer& aTimer,
 	CAvrcpPlayerInfoManager& aPlayerInfoManager)
 	{
 	LOG_STATIC_FUNC
-	CRcpRemoteDevice* engine = new(ELeave) CRcpRemoteDevice(aAddr, aRouter, aBearer, aTimer);
+	CRcpRemoteDevice* engine = new(ELeave) CRcpRemoteDevice(aAddr, aRouter, aCommandInterface, aTimer);
 	CleanupStack::PushL(engine);
 	engine->ConstructL(aObserver, aPlayerInfoManager);
 	CleanupStack::Pop(engine);
@@ -56,9 +56,9 @@
 */
 CRcpRemoteDevice::CRcpRemoteDevice(const TBTDevAddr& aAddr,
 	CRcpRouter& aRouter, 
-	CRemConBearerAvrcp& aBearer,
+	MRemConControlCommandInterface& aCommandInterface,
 	CDeltaTimer& aTimer) : 
-	iDevice(aAddr), iRouter(aRouter), iBearer(aBearer), iTimer(aTimer)
+	iDevice(aAddr), iRouter(aRouter), iCommandInterface(aCommandInterface), iTimer(aTimer)
 	{
 	LOG_FUNC
 	}
@@ -72,8 +72,8 @@
 	CAvrcpPlayerInfoManager& aPlayerInfoManager)
 	{
 	LOG_FUNC	
-	iIncoming = CRcpIncomingCommandHandler::NewL(iBearer, aObserver, iRouter, iTimer, aPlayerInfoManager, iDevice);
-	iOutgoing = CRcpOutgoingCommandHandler::NewL(iBearer, aObserver, iRouter, iTimer);
+	iIncoming = CRcpIncomingCommandHandler::NewL(iCommandInterface, aObserver, iRouter, iTimer, aPlayerInfoManager, iDevice);
+	iOutgoing = CRcpOutgoingCommandHandler::NewL(iCommandInterface, aObserver, iRouter, iTimer);
 	}
 
 /** Destructor.

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpsdputils.cpp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpsdputils.cpp	Mon Jul 12 18:51: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"
@@ -29,18 +29,14 @@
 		if(aProfileVersion == AvrcpSdp::KAvrcpProfileVersion13)
 			{
 			serviceClassUuids->StartListL()
-				->BuildDESL()->StartListL()
 					->BuildUUIDL(TUUID(TUint16(KAVRemoteControlUUID)))
-				->EndListL()
 			->EndListL();
 			}
 		else
 			{
 			serviceClassUuids->StartListL()
-				->BuildDESL()->StartListL()
 					->BuildUUIDL(TUUID(TUint16(KAVRemoteControlUUID)))
 					->BuildUUIDL(TUUID(TUint16(KAVRemoteControlControllerUUID)))
-				->EndListL()
 			->EndListL();
 			}
 		

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/passthroughhelper.cpp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/passthroughhelper.cpp	Mon Jul 12 18:51:05 2010 +0300
@@ -21,9 +21,9 @@
 #include "controlbearer.h"
 
 
-CPassthroughHelper* CPassthroughHelper::NewL(CRcpRouter& aRouter, CRemConBearerAvrcp& aBearer, CDeltaTimer& aTimer)
+CPassthroughHelper* CPassthroughHelper::NewL(CRcpRouter& aRouter, MRemConControlCommandInterface& aCommandInterface, CDeltaTimer& aTimer)
 	{
-	CPassthroughHelper* helper = new(ELeave)CPassthroughHelper(aRouter, aBearer, aTimer);
+	CPassthroughHelper* helper = new(ELeave)CPassthroughHelper(aRouter, aCommandInterface, aTimer);
 	CleanupStack::PushL(helper);
 	helper->ConstructL();
 	CleanupStack::Pop(helper);
@@ -34,9 +34,9 @@
 	{
 	}
 	
-CPassthroughHelper::CPassthroughHelper(CRcpRouter& aRouter, CRemConBearerAvrcp& aBearer, CDeltaTimer& aTimer)
+CPassthroughHelper::CPassthroughHelper(CRcpRouter& aRouter, MRemConControlCommandInterface& aCommandInterface, CDeltaTimer& aTimer)
 	: iRouter(aRouter)
-	, iBearer(aBearer)
+	, iCommandInterface(aCommandInterface)
 	, iTimer(aTimer)
 	{
 	}
@@ -164,7 +164,7 @@
 					{
 					iPreviousPassthrough->SetClick(EFalse);
 					iPreviousPassthrough->SetCoreButtonAction(ERemConCoreApiButtonPress, ETrue);
-					iBearer.MrcciNewCommand(*iPreviousPassthrough, iPreviousPassthrough->ClientId());
+					iCommandInterface.MrcciNewCommand(*iPreviousPassthrough, iPreviousPassthrough->ClientId());
 					}
 				StartReleaseTimer(*iPreviousPassthrough);
 				}
@@ -174,7 +174,7 @@
 				// to RemCon then start waiting for click.
 				iPreviousPassthrough->CancelTimer(iTimer);
 				iPreviousPassthrough->SetCoreButtonAction(ERemConCoreApiButtonClick, ETrue);
-				iBearer.MrcciNewCommand(*iPreviousPassthrough, iPreviousPassthrough->ClientId());
+				iCommandInterface.MrcciNewCommand(*iPreviousPassthrough, iPreviousPassthrough->ClientId());
 				
 				HandledCommand(*iPreviousPassthrough);
 									
@@ -214,7 +214,7 @@
 				// Cancel hold timer and send the previous command as a click.
 				iPreviousPassthrough->CancelTimer(iTimer); 
 				iPreviousPassthrough->SetCoreButtonAction(ERemConCoreApiButtonClick, ETrue);
-				iBearer.MrcciNewCommand(*iPreviousPassthrough, iPreviousPassthrough->ClientId());
+				iCommandInterface.MrcciNewCommand(*iPreviousPassthrough, iPreviousPassthrough->ClientId());
 				
 				HandledCommand(*iPreviousPassthrough);
 				}
@@ -228,7 +228,7 @@
 					{
 					aCommand.SetCoreButtonAction(ERemConCoreApiButtonRelease, ETrue);
 					}
-				iBearer.MrcciNewCommand(aCommand, aCommand.ClientId());
+				iCommandInterface.MrcciNewCommand(aCommand, aCommand.ClientId());
 				aCommand.DecrementUsers();
 				}
 			}
@@ -267,7 +267,7 @@
 		}
 	else
 		{
-		iBearer.MrcciNewCommand(aCommand, aCommand.ClientId());
+		iCommandInterface.MrcciNewCommand(aCommand, aCommand.ClientId());
 		StartReleaseTimer(aCommand);
 		}
 	}
@@ -303,7 +303,7 @@
 			TRAPD(err, aCommand.ReSetCoreButtonActionL(ERemConCoreApiButtonRelease, ETrue));
 			if (err == KErrNone)
 				{
-				iBearer.MrcciNewCommand(aCommand, aCommand.ClientId());
+				iCommandInterface.MrcciNewCommand(aCommand, aCommand.ClientId());
 				}
 				else
 				{
@@ -386,7 +386,7 @@
 	aCommand.CancelTimer(iTimer);
 	aCommand.SetClick(EFalse);
 	aCommand.SetCoreButtonAction(ERemConCoreApiButtonPress, ETrue);
-	iBearer.MrcciNewCommand(aCommand, aCommand.ClientId());
+	iCommandInterface.MrcciNewCommand(aCommand, aCommand.ClientId());
 	StartReleaseTimer(aCommand);
 	}
 

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/remconbeareravrcp.cpp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/remconbeareravrcp.cpp	Mon Jul 12 18:51:05 2010 +0300
@@ -870,6 +870,54 @@
 	Observer().SetRemoteAddressedClient(TUid::Uid(KRemConBearerAvrcpImplementationUid), aClientId);
 	}
 
+void CRemConBearerAvrcp::MrccciRegisterForLocalAddressedClientUpdates()
+	{
+	// Addressed player observers are registered with RemCon on a per-bearer basis
+	// so we aggregate interest from remote here
+	iRemotesInterestedInLocalAddressedClient++;
+	if(iRemotesInterestedInLocalAddressedClient == 1)
+		{
+		// Weren't any registered before, tell RemCon we care
+		Observer().RegisterLocalAddressedClientObserver(TUid::Uid(KRemConBearerAvrcpImplementationUid));
+		}
+	
+#ifdef __DEBUG
+	TInt numRemotes = 0;
+	CRcpRemoteDevice* remote = NULL;
+	
+	TDblQueIter<CRcpRemoteDevice> iter(iRemotes);
+	while (iter++)
+		{
+		numRemotes++;
+		}
+	__ASSERT_DEBUG(iRemotesInterestedInLocalAddressedClient <= numRemotes, AVRCP_PANIC(ETooManyRemotesRegisterForLocalAddressedPlayerUpdates));
+#endif
+	}
+
+void CRemConBearerAvrcp::MrccciUnregisterForLocalAddressedClientUpdates()
+	{
+#ifdef __DEBUG
+	TInt numRemotes = 0;
+	CRcpRemoteDevice* remote = NULL;
+	
+	TDblQueIter<CRcpRemoteDevice> iter(iRemotes);
+	while (iter++)
+		{
+		numRemotes++;
+		}
+	__ASSERT_DEBUG(iRemotesInterestedInLocalAddressedClient <= numRemotes, AVRCP_PANIC(ETooManyRemotesRegisterForLocalAddressedPlayerUpdates));
+	__ASSERT_DEBUG(iRemotesInterestedInLocalAddressedClient > 0, AVRCP_PANIC(ETooFewRemotesRegisterForLocalAddressedPlayerUpdates));
+#endif
+
+	iRemotesInterestedInLocalAddressedClient--;
+	if(iRemotesInterestedInLocalAddressedClient == 0)
+		{
+		// No-one left who cares.  Tell RemCon not to bother updating
+		// us anymore.
+		Observer().UnregisterLocalAddressedClientObserver(TUid::Uid(KRemConBearerAvrcpImplementationUid));
+		}
+	}
+
 /** Called from outgoing handlers to notify that a response
 for a notify command is ready for RemCon. 
 

--- a/bluetoothengine/btaudioman/src/basrvmain.cpp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/btaudioman/src/basrvmain.cpp	Mon Jul 12 18:51:05 2010 +0300
@@ -30,8 +30,8 @@
 GLDEF_C TInt E32Main()
     {
     TRACE_STATIC_FUNC
-
-    __UHEAP_MARK;
+    //TODO uncomment UHEAP macros after orbit & Qt memory leaks are resolved till then it should be commented.
+//    __UHEAP_MARK;
     CTrapCleanup* cleanup=CTrapCleanup::New();
     TInt r=KErrNoMemory;
     if (cleanup)
@@ -40,7 +40,7 @@
         delete cleanup;
         }
     //
-    __UHEAP_MARKEND;
+//    __UHEAP_MARKEND;
     return r;
     }
 

--- a/bluetoothengine/btaudiostreamer/tsrc/BtAudioStreamerApiTest/conf/BtAudioStreamerApiTest.cfg	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/btaudiostreamer/tsrc/BtAudioStreamerApiTest/conf/BtAudioStreamerApiTest.cfg	Mon Jul 12 18:51:05 2010 +0300
@@ -1,23 +1,23 @@
-//BtAudioStreamer tests
-
-[Test]
-title BT Initialization Test
-create BtAudioStreamerApiTest tester
-tester InitializationTest
-delete tester
-[Endtest] 
-
-[Test]
-title BT Start/Stop Audio Streamer Test
-create BtAudioStreamerApiTest tester
-tester StartStopTest
-delete tester
-[Endtest] 
-
-
-[Test]
-title BT Set New Frame Length Test
-create BtAudioStreamerApiTest tester
-tester SetNewFrameLengthTest
-delete tester
-[Endtest] 
+//BtAudioStreamer tests
+
+[Test]
+title BT Initialization Test
+create BtAudioStreamerApiTest tester
+tester InitializationTest
+delete tester
+[Endtest] 
+
+[Test]
+title BT Start/Stop Audio Streamer Test
+create BtAudioStreamerApiTest tester
+tester StartStopTest
+delete tester
+[Endtest] 
+
+
+[Test]
+title BT Set New Frame Length Test
+create BtAudioStreamerApiTest tester
+tester SetNewFrameLengthTest
+delete tester
+[Endtest] 

--- a/bluetoothengine/bteng/btbearer/inc/btpluginnotifier.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/bteng/btbearer/inc/btpluginnotifier.h	Mon Jul 12 18:51:05 2010 +0300
@@ -25,6 +25,7 @@
 #include <locodbearerpluginparams.h>      
 #include <centralrepository.h>      
 #include <locodbearer.h>
+#include <hbindicatorsymbian.h>
 
 
 /**
@@ -149,6 +150,8 @@
      * Own.
      */
     CRepository* iSession;
+    
+    CHbIndicatorSymbian* iBTIndicator;
 
     };
 

--- a/bluetoothengine/bteng/btbearer/src/btpluginnotifier.cpp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/bteng/btbearer/src/btpluginnotifier.cpp	Mon Jul 12 18:51:05 2010 +0300
@@ -24,6 +24,8 @@
 #include "debug.h"
 #include <btfeaturescfg.h>
 #include <btnotifclient.h>
+#include "btindicatorconstants.h"
+#include <hbsymbianvariant.h>
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -60,6 +62,7 @@
 	delete repository;
 	
 	CBTEngSettings* settings = CBTEngSettings::NewL();
+	iBTIndicator = CHbIndicatorSymbian::NewL(); 
 	
 	BluetoothFeatures::TEnterpriseEnablementMode mode = BluetoothFeatures::EnterpriseEnablementL();
 	TRACE_INFO( ( _L( "mode = %d" ), mode) )
@@ -78,6 +81,14 @@
         {
         TRACE_INFO( ( _L( "Turning BT off" ) ) )
         (void) settings->SetPowerState( EBTPowerOff );	// Result is not important here
+        TInt state =  EBTIndicatorOff;
+        CHbSymbianVariant* parameters = CHbSymbianVariant::NewL(&state,CHbSymbianVariant::EInt );
+        TBool success = iBTIndicator->Activate(KIndicatorType(),parameters); 
+        delete parameters;
+        if(!success)
+            {
+            User::Leave(iBTIndicator->Error());
+            }
         }
     delete settings;
 	if ( mode != BluetoothFeatures::EDisabled ) // only subscribe if there's any point (NB changing Enterprise Disabling mode requires a reboot)
@@ -112,6 +123,7 @@
     TRACE_FUNC_ENTRY
     Cancel();
     delete iSession;
+    delete iBTIndicator;
     }
 
 

Binary file bluetoothengine/bteng/conf/CI_bteng.confml has changed

Binary file bluetoothengine/bteng/conf/bteng.confml has changed

--- a/bluetoothengine/bteng/group/bld.inf	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/bteng/group/bld.inf	Mon Jul 12 18:51:05 2010 +0300
@@ -37,6 +37,10 @@
 ../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
 
 

--- a/bluetoothengine/bteng/group/btbearer.mmp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/bteng/group/btbearer.mmp	Mon Jul 12 18:51:05 2010 +0300
@@ -43,6 +43,7 @@
 MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE           /epoc32/include/ecom
 SYSTEMINCLUDE           ../../../inc
+SYSTEMINCLUDE  /epoc32/include/mw/hb/hbcore
 
 LIBRARY                 euser.lib
 LIBRARY                 ecom.lib
@@ -50,4 +51,5 @@
 LIBRARY                 btengsettings.lib
 LIBRARY                 btfeatures.lib
 LIBRARY                 btnotifclient.lib
+LIBRARY 				hbcore.lib
 DEBUGLIBRARY            flogger.lib             // File logging services

--- a/bluetoothengine/bteng/group/bteng.mmp	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/bteng/group/bteng.mmp	Mon Jul 12 18:51:05 2010 +0300
@@ -43,6 +43,7 @@
 
 USERINCLUDE             ../inc  
 SYSTEMINCLUDE           ../../inc
+SYSTEMINCLUDE  /epoc32/include/mw/hb/hbcore
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY                 euser.lib
@@ -59,6 +60,7 @@
 LIBRARY                 featmgr.lib
 LIBRARY                 aknnotify.lib
 LIBRARY                 btfeatures.lib
+LIBRARY 				hbcore.lib
 
 LIBRARY                 btpowercontrol.lib
 #ifndef __WINS__

--- a/bluetoothengine/bteng/inc/btengincpair.h	Fri May 28 17:03:06 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-/*
-* Copyright (c) 2008 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Incoming Pairing handler definition
-*
-*/
-
-
-#ifndef BTENGINCPAIR_H_
-#define BTENGINCPAIR_H_
-
-#include <bt_sock.h>
-#include "btengpairbase.h"
-
-/**
- *  Class CBTEngIncPair
- *
- *  Handles an incoming pairing.
- *
- *  @since S60 S60 v5.1
- */
-NONSHARABLE_CLASS( CBTEngIncPair ) : public CBTEngPairBase
-    {
-public:
-
-    /**
-     * Two-phase constructor
-     * @param aParent the owner of this observer
-     * @param aAddr the remote device this observer is targeted to
-     */
-    static CBTEngIncPair* NewL( CBTEngPairMan& aParent, 
-            const TBTDevAddr& aAddr);
-
-    /**
-     * Destructor
-     */
-    ~CBTEngIncPair();
-    
-    
-private: // From CBTEngPairBase
-    
-    /**
-     * Start observing the result of pairing which was originated from
-     * the remote device.
-     * @param the address of the remote device to be paired
-     * @return KErrNone if this request is accepted; otherwise an error code
-     */
-    TInt ObserveIncomingPair( const TBTDevAddr& aAddr );
-
-    /**
-     * Start an outgoing pairing with the remote device.
-     * @param the address of the remote device to be paired
-     * @return KErrNone if this request is accepted; otherwise an error code
-     */
-    void HandleOutgoingPairL( const TBTDevAddr& aAddr, TUint aCod );
-
-    /**
-     * Cancels pairing handling with the specified device
-     * @param aAddr the address of the device the pairing is with
-     */
-    void StopPairHandling( const TBTDevAddr& aAddr );
-    
-    /**
-     * Handle a pairing result with the remote device which this is for.
-     * Must be specialized by subclass.
-     *
-     * @param aResult The status code of the pairing or authentication result.
-     */
-    void DoHandlePairServerResult( TInt aResult );
-    
-    /**
-     * Handles event of registry new paired event with the remote 
-     * device this is for.
-     * @aType the type of authentication with the device.
-     */
-    void DoHandleRegistryNewPairedEvent( const TBTNamelessDevice& aDev );
-    
-private: // from base class MBTEngActiveObserver
-
-    /**
-     * From MBTEngActiveObserver.
-     * Callback to notify that an outstanding request has completed.
-     *
-     * @since S60 v5.1
-     * @param aActive Pointer to the active object that completed.
-     * @param aId The ID that identifies the outstanding request.
-     * @param aStatus The status of the completed request.
-     */
-    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aId, TInt aStatus );
-
-    /**
-     * From MBTEngActiveObserver.
-     * Callback to notify that an error has occurred in RunL.
-     *
-     * @since S60 v5.1
-     * @param aActive Pointer to the active object that completed.
-     * @param aId The ID that identifies the outstanding request.
-     * @param aStatus The status of the completed request.
-     */
-    virtual void HandleError( CBTEngActive* aActive, TInt aId, TInt aError );
-    
-private:
-    
-    /**
-     * C++ default constructor
-     */
-    CBTEngIncPair(CBTEngPairMan& aParent, const TBTDevAddr& aAddr);
-    
-    /**
-     * 2nd phase constructor.
-     */
-    void ConstructL();
-    
-    /**
-     * Start monitoring physical link events if it hasn't yet.
-     *
-     * @since S60 v5.1
-     * 
-     */
-    void MonitorPhysicalLink();
-    
-    /**
-     * Opens physical link adaptor with the device.
-     * 
-     * @since S60 v5.1
-     * @return KErrNone if the physical link exists.
-     * 
-     */
-    TInt OpenPhysicalLinkAdaptor();
-    
-    /**
-     * Cancel all outstanding requests.
-     *
-     * @since S60 v5.1
-     */
-    void CancelPlaNotification();
-    
-    /**
-     * Handle a physical link event.
-     *
-     * @since S60 v5.1
-     * @param aResult The status code of the event.
-     */
-    void HandlePhysicalLinkResultL( TInt aResult );
-
-private:
-    
-    /**
-     * Package buffer for retrieving physical link events.
-     */
-    TBTBasebandEvent iBbEvent;
-
-    /**
-     * Subsession with the socket server for 
-     * getting physical link event notifications.
-     */
-    RBTPhysicalLinkAdapter iPla;
-    
-    /**
-     * iPairingOkTimer is activated if the link goes down.
-     * If it expires it means the pairing process has failed, 
-     * then the error popup will be shown.
-     * If the pairing process ends correctly, DoHandleRegistryNewPairedEvent 
-     * will be called and it will cancel the timer. 
-     * iActivePairingOk is the active object associated to the timer.  
-     */
-    RTimer iPairingOkTimer;
-    CBTEngActive* iActivePairingOk;
-    TBool iUserAwarePairing;
-    };
-
-#endif /*BTENGINCPAIR_H_*/

--- a/bluetoothengine/bteng/inc/btengotgpair.h	Fri May 28 17:03:06 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-/*
-* Copyright (c) 2006 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Helper class for performing pairing (i.e. bonding) 
-*                with another device.
-*
-*/
-
-#ifndef BTENGOTGPAIR_H_
-#define BTENGOTGPAIR_H_
-
-#include <bttypes.h>
-#include <bluetooth/pairing.h>
-#include <e32property.h>
-#include "btengpairbase.h"
-#include "btengprivatepskeys.h"
-
-/**
- *  Perform a outgoing pair with a BT device.
- *
- *  @lib ?library
- *  @since S60 v5.1
- */
-NONSHARABLE_CLASS( CBTEngOtgPair ) : public CBTEngPairBase
-    {
-
-public:
-
-    /**
-     * Two-phase constructor
-     * @param aParent the owner of this object
-     * @param aAddr the remote device this observer is targeted to
-     */
-    static CBTEngPairBase* NewL( CBTEngPairMan& aParent, 
-            const TBTDevAddr& aAddr );
-
-    /**
-     * Destructor
-     */
-    ~CBTEngOtgPair();
-    
-private: // From CBTEngPairBase
-    
-    /**
-     * Start observing the result of pairing which was originated from
-     * the remote device.
-     * @param the address of the remote device to be paired
-     * @return KErrNone if this request is accepted; otherwise an error code
-     */
-    TInt ObserveIncomingPair( const TBTDevAddr& aAddr );
-
-    /**
-     * Start an outgoing pairing with the remote device.
-     * @param the address of the remote device to be paired
-     * @return KErrNone if this request is accepted; otherwise an error code
-     */
-    void HandleOutgoingPairL( const TBTDevAddr& aAddr, TUint aCod );
-    
-    /**
-     * Cancel any outstanding pairing operation.
-     */
-    void CancelOutgoingPair();
-
-    /**
-     * Cancels pairing handling with the specified device
-     * @param aAddr the address of the device the pairing is with
-     */
-    void StopPairHandling( const TBTDevAddr& aAddr );
-    
-    /**
-     * Handle a pairing result with the remote device which this is for.
-     * Must be specialized by subclass.
-     *
-     * @param aResult The status code of the pairing or authentication result.
-     */
-    void DoHandlePairServerResult( TInt aResult );
-    
-    /**
-     * Handles registry new paired event for the remote 
-     * device this is pairing with.
-     * @aType the type of authentication with the device.
-     */
-    void DoHandleRegistryNewPairedEvent( const TBTNamelessDevice& aDev );
-    
-private: // from base class MBTEngActiveObserver
-
-    /**
-     * From MBTEngActiveObserver.
-     * Callback to notify that an outstanding request has completed.
-     *
-     * @since S60 v5.1
-     * @param aActive Pointer to the active object that completed.
-     * @param aId The ID that identifies the outstanding request.
-     * @param aStatus The status of the completed request.
-     */
-    void RequestCompletedL( CBTEngActive* aActive, TInt aId, TInt aStatus );
-
-    /**
-     * From MBTEngActiveObserver.
-     * Callback to notify that an error has occurred in RunL.
-     *
-     * @since S60 v5.1
-     * @param aActive Pointer to the active object that completed.
-     * @param aId The ID that identifies the outstanding request.
-     * @param aStatus The status of the completed request.
-     */
-    void HandleError( CBTEngActive* aActive, TInt aId, TInt aError );
-
-private:
-
-    /**
-     * C++ default constructor
-     */
-    CBTEngOtgPair( CBTEngPairMan& aParent, const TBTDevAddr& aAddr );
-
-    /**
-     * Symbian 2nd-phase constructor
-     */
-    void ConstructL();
-    
-    /**
-     * Starts an actual pair operation.
-     */
-    void DoPairingL();
-    
-    /**
-     * Cancel any outstanding pairing operation.
-     */
-    void DoCancelOutgoingPair();
-    
-private: // data
-	
-    /**
-     * Socket address of the remote device to pair with.
-     */	
-	TBTSockAddr iSockAddr;
-	
-	/**
-	 * The CoD of the device to be paired
-	 */
-	TUint32 iCod;
-
-    /**
-     * Dedicated bonding session to the pairing server.
-     */
-    RBluetoothDedicatedBondingInitiator iBondingSession;
-    
-    /**
-     * socket for creating L2CAP link with the remote device.
-     */
-    RSocket iSocket;
-	
-    /**
-     * Timer for recovery from Repeated Attempts
-     */
-    RTimer iTimer;
-    
-    /**
-     * used for getting and setting outgoing pair state
-     */
-    RProperty iOutgoProperty;
-    
-    /**
-     * the current pairing mode this class is in
-     */
-    TBTOutgoingPairMode iPairMode;
-    
-    };
-
-
-#endif // BTENGOTGPAIR_H_

--- a/bluetoothengine/bteng/inc/btengpairbase.h	Fri May 28 17:03:06 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-/*
-* Copyright (c) 2008 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  the base class of pairing handling
-*
-*/
-
-
-#ifndef BTENGPAIRBASE_H_
-#define BTENGPAIRBASE_H_
-
-#include <e32base.h>
-#include <bttypes.h>
-#include <btnotif.h>
-#include "btengactive.h"
-
-class CBTEngPairMan;
-
-/**  Identification for asynchronous operations */
-enum TPairBaseActiveRequestId
-    {
-    EDevicePairUserNotification = 1
-    };
-
-/**
- *  Class CBTEngPairBase
- *
- *  The base class for pairing handling. 
- *  When the pairing has completed (successfully or unsuccessfully), the user
- *  is informed of the result
- *
- *  @since S60 S60 v5.1
- */
-NONSHARABLE_CLASS( CBTEngPairBase ) : public CBase, public MBTEngActiveObserver
-    {
-public:
-    
-    /**
-     * Destructor
-     */
-    virtual ~CBTEngPairBase();
-    
-    /**
-     * Handle a pairing result from the pairing server.
-     *
-     * @param aAddr the address of the remote device which the result is for.
-     * @param aResult The status code of the pairing or authentication result.
-     */
-    void HandlePairServerResult( const TBTDevAddr& aAddr, TInt aResult );
-    
-    /**
-     * Handles event of new paired device event in registry.
-     * @param aDev the remote device which the pair is with.
-     */
-    void HandleRegistryNewPairedEvent( const TBTNamelessDevice& aDev );
-    
-    /**
-     * Start observing the result of the pairing originated by
-     * the remote device.
-     * Must be specialized by subclass.
-     * @param the address of the remote device to be paired
-     * @return KErrNone if this request is accepted; otherwise an error code
-     */
-    virtual TInt ObserveIncomingPair( const TBTDevAddr& aAddr ) = 0;
-
-    /**
-     * Start an outgoing pairing with the remote device.
-     * Must be specialized by subclass.
-     * @param the address of the remote device to be paired
-     * @return KErrNone if this request is accepted; otherwise an error code
-     */
-    virtual void HandleOutgoingPairL( const TBTDevAddr& aAddr, TUint aCod ) = 0;
-    
-    /**
-     * Cancel the outstanding pairing operation.
-     */
-    virtual void CancelOutgoingPair();
-
-    /**
-     * Cancels pairing handling with the specified device
-     * @param aAddr the address of the device the pairing is with
-     */
-    virtual void StopPairHandling( const TBTDevAddr& aAddr ) = 0;
-    
-protected:
-    
-    /**
-     * Handle a pairing result with the remote device which this is for.
-     * Must be specialized by subclass.
-     *
-     * @param aResult The status code of the pairing or authentication result.
-     */
-    virtual void DoHandlePairServerResult( TInt aResult ) = 0;
-    
-    /**
-     * Handles event of registry new paired event with the remote 
-     * device this is for.
-     * Must be specialized by subclass.
-     * @aType the type of authentication with the device.
-     */
-    virtual void DoHandleRegistryNewPairedEvent( const TBTNamelessDevice& aDev ) = 0;
-    
-protected:
-    
-    /**
-     * C++ default constructor
-     */
-    CBTEngPairBase(CBTEngPairMan& aParent, const TBTDevAddr& aAddr);
-    
-    /**
-     * Symbian 2nd-phase constructor
-     */
-    void BaseConstructL();
-
-    /**
-     * Cancels notifying user about the pairing result.
-     */
-    void CancelNotifier();
-    
-    /**
-     * Show the pairing result and ask the user to authorize the device if
-     * pair succeeded.
-     *
-     * @since S60 v5.1
-     */
-    void ShowPairingNoteAndAuthorizeQuery();    
-    
-    /**
-     * Invalidate the pair result flag of this 
-     */
-    void UnSetPairResult();
-    
-    /**
-     * Sets the pair result and validate pair result flag
-     */
-    void SetPairResult( TInt aResult );
-    
-    /**
-     * Tells if the pair result has been set.
-     * @ETrue if the result has been set.
-     */
-    TBool IsPairResultSet();
-    
-    /**
-     * Tells if this is notifying user the pairing result.
-     * @return ETrue if this is is notifying user the pairing result
-     */
-    TBool IsNotifyingPairResult();
-    
-protected:
-
-    /**
-     * Address of the remote device we are trying to pair.
-     */
-    TBTDevAddr iAddr;
-    
-    /**
-     * Contains the final result of pairing with the remote device
-     */
-    TInt iPairResult;
-    
-    /**
-     * Pair result flag, ETrue if iPairResult is been set.
-     */
-    TBool iPairResultSet;
-    
-    /**
-     * Reference to the owner of this object.
-     */
-    CBTEngPairMan& iParent;
-
-    /**
-     * Package buffer for passing parameters to authorization notifier.
-     */
-    TBTPairedDeviceSettingParamsPckg iAuthoPckg;
-
-    /**
-     * Session with the notifier server.
-     * Own.
-     */
-    RNotifier iNotifier;
-    
-    /**
-     * Active object helper for asynchronous operations.
-     * Own.
-     */
-    CBTEngActive* iActive;
-    };
-
-#endif /*BTENGPAIRBASE_H_*/

--- a/bluetoothengine/bteng/inc/btengpairman.h	Fri May 28 17:03:06 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,355 +0,0 @@
-/*
-* Copyright (c) 2009-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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Pairing manager header definition
-*
-*/
-
-#ifndef BTENGPAIRMANAGER_H_
-#define BTENGPAIRMANAGER_H_
-
-#include <bttypes.h>
-#include <bt_sock.h>
-#include <bluetooth/pairing.h>
-#include "btengactive.h"
-#include "btengconstants.h"
-
-class CBTEngPairBase;
-class CBTEngServer;
-
-/**
- *  Class CBTEngPairMan
- *
- *  This class manages pairing with BT devices.
- *  The responsibility of handling incoming and outgoing pairings is
- *  delegated to CBTEngIncPair and CBTEngOtgPair respectively.
- *
- *  @since S60 S60 v5.1
- */
-NONSHARABLE_CLASS( CBTEngPairMan ) : public CBase, public MBTEngActiveObserver
-    {
-public:
-
-    /**
-     * Two-phase constructor
-     */
-    static CBTEngPairMan* NewL( CBTEngServer& aServer );
-
-    /**
-     * Destructor
-     */
-    ~CBTEngPairMan();
-
-    /**
-     * Cancels an outstanding pairing request.
-     */
-    void CancelOutgoingPair();    
-    
-    /**
-     * Process commands relevant to pairing
-     */
-    void ProcessCommandL( const RMessage2& aMessage );
-    
-    /**
-     * Handle a change in BTRegistry remote device table.
-     *
-     * @since S60 v5.1
-     */
-    void RemoteRegistryChangeDetected();
-
-    /**
-     * Gets the instance of pairing server.
-     * @return the server instance. NULL if dedicated bonding is unavailable.
-     */
-    RBluetoothPairingServer* PairingServer();
-    
-    /**
-     * gets the reference of socket server session
-     */
-    RSocketServ& SocketServ();
-    
-    /**
-     * gets the reference of registry session.
-     */
-    RBTRegServ& BTRegServ();
-    
-    /**
-     *  Transfer responsiblity to the specified object.
-     *  @param aPairer the object to which the responsibility is transfered.
-     */
-    void RenewPairer( CBTEngPairBase* aPairer );
-    
-    /**
-     * Be notified when handling of an outgoing pair has been completed.
-     * @param aErr the result of pairing
-     * 
-     */
-    void OutgoingPairCompleted( TInt aErr );
-    
-    /**
-     * Be informed that a session will be closed.
-     *
-     * @since Symbian^3
-     * @param aSession the session to be cloased.
-     */
-    void SessionClosed(CSession2* aSession );
-    
-    /**
-     * Unpair a device via registry
-     */
-    void UnpairDevice( const TBTDevAddr& aAddr );
-    
-    /**
-     * Add the bit indicating the device is user-aware Just worked paired to
-     * UI cookie.
-     */
-    TInt AddUiCookieJustWorksPaired( const TBTNamelessDevice& aDev );
-    
-    /**
-     * Update a nameless device in registry
-     */
-    TInt UpdateRegDevice( const TBTNamelessDevice& aDev );
-    
-    
-    /**
-     * Returns the service (limited to services managed in bteng scope)
-     * level connection status of the specified device.
-     *
-     * @param aAddr the address of the device
-     * @return one of TBTEngConnectionStatus enums
-     */
-    TBTEngConnectionStatus IsDeviceConnected( const TBTDevAddr& aAddr );
-    
-private: // from base class MBTEngActiveObserver
-
-    /**
-     * From MBTEngActiveObserver.
-     * Callback to notify that an outstanding request has completed.
-     *
-     * @since S60 v5.1
-     * @param aActive Pointer to the active object that completed.
-     * @param aId The ID that identifies the outstanding request.
-     * @param aStatus The status of the completed request.
-     */
-    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aId, TInt aStatus );
-
-    /**
-     * From MBTEngActiveObserver.
-     * Callback to notify that an error has occurred in RunL.
-     *
-     * @since S60 v5.1
-     * @param aActive Pointer to the active object that completed.
-     * @param aId The ID that identifies the outstanding request.
-     * @param aStatus The status of the completed request.
-     */
-    virtual void HandleError( CBTEngActive* aActive, TInt aId, TInt aError );
-
-private:
-    
-    /**
-     * C++ default constructor
-     */
-    CBTEngPairMan( CBTEngServer& aServer );
-    
-    /**
-     * Symbian 2nd-phase constructor
-     */
-    void ConstructL();
-
-    /**
-     * Initialiases the paired devices list
-     */
-    void InitPairedDevicesList();
-
-    /**
-     * Initialises the paired devices list (second stage)
-     */
-    void DoInitPairedDevicesList();
-
-    /**
-     * Activate / deactivate a pair observer
-     */
-    TInt SetPairObserver(const TBTDevAddr& aAddr, TBool aActivate);
-    
-    /**
-     * Pair a BT device.
-     */
-    void PairDeviceL( const TBTDevAddr& aAddr, TUint32 aCod );
-    
-    /**
-     * Cancel all subscribes to pairng server
-     */
-    void CancelSubscribe();
-    
-    /**
-     * subscribe to receive SSP pairing result from pairing server
-     */
-    void SubscribeSspPairingResult();
-    
-    /**
-     * Subscribe to receive authentication result from pairing server
-     */
-    void SubscribeAuthenticateResult();
-
-    /**
-     * Handle a pairing result from the pairing server.
-     *
-     * @since S60 v5.1
-     * @param aResult The status code of the authentication result.
-     */
-    void HandlePairingResultL( const TBTDevAddr& aAddr, TInt aResult );
-    
-    /**
-     * Creates a registry view which shall contain all paired devices.
-     */    
-    void CreatePairedDevicesView( TInt aReqId );
-    
-    /**
-     * retrieves paired devices from registry.
-     */
-    void GetPairedDevices( TInt aReqId );
-    
-    /**
-     * handles the completion of paired device view creation
-     */
-    void HandleCreatePairedDevicesViewCompletedL( TInt aStatus, TInt aReqId );
-    
-    /**
-     * handles the completion of getting paired devices
-     */
-    void HandleGetPairedDevicesCompletedL( TInt aStatus, TInt aReqId );
-    
-    /**
-     * Copy the paired devices to internal array storage.
-     */
-    void UpdatePairedDeviceListL();
-    
-    /**
-     * Checks if any devices have been paired or unpaired. For each new paired device,
-     * the pair event will be delegated to corresponding pair observer if it exists;
-     * otherwise create a new pair observer for this pair event.
-     */
-    void CheckPairEventL();
-    
-private:
-
-    /**
-     * Owner of this class.
-     * Not owned.
-     */
-    CBTEngServer& iServer;
-    
-    /**
-     * Registry sub session for remote device db
-     */
-    RBTRegistry iBTRegistry;
-    
-    /**
-     * contains the list of all paired devices.
-     * Using heap here to make efficient array swap.
-     */
-    RArray<TBTNamelessDevice>* iPairedDevices;
-    
-    /**
-     * temporary instance to retrieve paired devices.
-     */
-    CBTRegistryResponse* iPairedDevicesResp;
-    
-    /**
-     * the counter of not handled registry events.
-     */
-    TInt iNotHandledRegEventCounter;
-    
-    /**
-     * Session with the pairing server.
-     * Allocate it in heap to ease the handling for 
-     * situation of unavailable dedicated pairing service.
-     * 
-     * own.
-     */
-    RBluetoothPairingServer* iPairingServ;
-
-    /**
-     * Subsession with the pairing server for 
-     * getting the simple pairing result.
-     * own
-     */
-    RBluetoothPairingResult iPairingResult;
-
-    /**
-     * Subsession with the pairing server for 
-     * getting the authentication result.
-     * own
-     */
-    RBluetoothAuthenticationResult iAuthenResult;
-
-    /**
-     * the address with which a simple pairing has been performed
-     */
-    TBTDevAddr iSimplePairingRemote;
-
-    /**
-     * the address with which an authentication has been performed
-     */
-    TBTDevAddr iAuthenticateRemote;
-    
-    /**
-     * Active object helper for receiving simple pairing results.
-     * Own.
-     */
-    CBTEngActive* iSSPResultActive;
-
-    /**
-     * Active object helper for receiving authentication results.
-     * Own.
-     */
-    CBTEngActive* iAuthenResultActive;
-
-    /**
-     * AO for registry operations
-     */
-    CBTEngActive* iRegistryActive;
-    
-    /**
-     * pair hanlder at the time.
-     * Own.
-     */
-    CBTEngPairBase* iPairer;
-    
-    /**
-     * Client-server message for power change requests.
-     */
-    RMessage2 iMessage;
-
-    /**
-     * AO for local address updates.
-     */
-    CBTEngActive* iLocalAddrActive;
-
-    /**
-     * Provides access to the BT local device address.
-     */
-    RProperty iPropertyLocalAddr;
-
-    /**
-     * Records whether or not this CBTEngPairMan has ever been involed in a pairing operaton.
-     */
-    TBool iPairingOperationAttempted;
-
-    /**
-     * Counter of unhandled paired device view initialisation requests.
-     */
-    TInt iNotHandledInitEventCounter;
-    };
-
-#endif /*BTENGPAIRMANAGER_H_*/

--- a/bluetoothengine/bteng/inc/btengsrvsettingsmgr.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengsrvsettingsmgr.h	Mon Jul 12 18:51:05 2010 +0300
@@ -29,6 +29,7 @@
 #include "btengactive.h"
 
 class CBTEngServer;
+class CHbIndicatorSymbian;
 
 
 /**
@@ -130,12 +131,11 @@
     
     /**
     * ?description
-    *
-    * @since S60 v3.2
-    * @param ?arg1 ?description
+    * 
+    * @param aState Current State of the Bluetooth
     */
-    void SetIndicatorStateL( const TInt aIndicator, const TInt aState );
-
+    void SetIndicatorStateL( const TInt aState );
+    
     /**
      * Update the Bluetooth visibility mode.
      *
@@ -305,6 +305,15 @@
      */
     RMessage2 iMessage;
     
+    /**
+     *  Orbit Indicator to display Bluetooth Status
+     */
+    CHbIndicatorSymbian* iBTIndicator;
+    
+    /*
+     *  Indicator State
+     */
+    TInt iIndicatorState;
     };
 
 

--- a/bluetoothengine/bteng/inc/btotgpairpub.inl	Fri May 28 17:03:06 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/*
-* Copyright (c) 2006 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implements getting/setting outgoing pair status
-*               from/to P&S KBTOutgoingPairing from btengprivatepskeys.h.
-*
-*/
-
-#include "btengprivatepskeys.h"
-#include <e32property.h>
-
-// ----------------------------------------------------------
-// Get outgoing pair status from PS
-// ----------------------------------------------------------
-//
-inline void OutgoPairingProperty(RProperty& aProperty, 
-        TBTDevAddr& aAddr, TBTOutgoingPairMode& aMode)
-    {
-    TBuf8<sizeof( TBTOutgoingPairProperty )> propDes;
-    TInt err = aProperty.Get( propDes );
-    if ( !err && propDes.Length() == sizeof( TBTOutgoingPairProperty ) )
-        {
-        TBTOutgoingPairProperty prop;
-        TPckgC<TBTOutgoingPairProperty> tmpPckg( prop );
-        tmpPckg.Set( propDes );
-        aAddr = tmpPckg().iAddr;
-        aMode = tmpPckg().iMode;
-        }
-    else
-        {
-        aMode = EBTOutgoingPairNone;
-        }
-    }
-
-// ----------------------------------------------------------
-// Get outgoing pair status from PS
-// ----------------------------------------------------------
-//
-inline void OutgoPairingProperty(TBTDevAddr& aAddr, TBTOutgoingPairMode& aMode)
-    {
-    RProperty property;
-    TInt err = property.Attach( 
-                KPSUidBluetoothEnginePrivateCategory, KBTOutgoingPairing );
-    if ( !err )
-        {
-        OutgoPairingProperty( property, aAddr, aMode );
-        }
-    else
-        {
-        aMode = EBTOutgoingPairNone;
-        }
-    property.Close();
-    }
-
-// ----------------------------------------------------------
-// Tells if another outgoing pairing is ongoing with a device
-// other than the specified one.
-// ----------------------------------------------------------
-//
-inline TBool OtherOutgoPairing( const TBTDevAddr& aAddr )
-    {
-    TBTDevAddr outpaddr;
-    TBTOutgoingPairMode mode;
-    OutgoPairingProperty( outpaddr, mode );
-    return mode != EBTOutgoingPairNone && outpaddr != aAddr;
-    }
-
-// ----------------------------------------------------------
-// Gets the status of outgoing pair with the specified device.
-// ----------------------------------------------------------
-//
-inline TBTOutgoingPairMode OutgoPairingMode(
-        RProperty& aProperty, const TBTDevAddr& aAddr )
-    {
-    TBTDevAddr addr;
-    TBTOutgoingPairMode mode;
-    OutgoPairingProperty(aProperty, addr, mode );
-    return ( addr == aAddr ) ? mode : EBTOutgoingPairNone;
-    }
-
-// ----------------------------------------------------------
-// Gets the status of outgoing pair with the specified device.
-// ----------------------------------------------------------
-//
-inline TBTOutgoingPairMode OutgoPairingMode(const TBTDevAddr& aAddr)
-    {
-    TBTDevAddr addr;
-    TBTOutgoingPairMode mode;
-    OutgoPairingProperty( addr, mode );
-    return ( addr == aAddr ) ? mode : EBTOutgoingPairNone;
-    }
-
-// ----------------------------------------------------------
-// publish outgoing pairing status to PS
-// ----------------------------------------------------------
-//
-inline void SetOutgoPairProperty(RProperty& aProperty, 
-        const TBTDevAddr& aAddr,
-        TBTOutgoingPairMode aMode )
-    {
-    if ( aMode == EBTOutgoingPairNone )
-        {
-        (void) aProperty.Set( KNullDesC8 );
-        return;
-        }
-    TPckgBuf<TBTOutgoingPairProperty> tmpPckg;
-    tmpPckg().iAddr = aAddr;
-    tmpPckg().iMode = aMode;
-    (void) aProperty.Set( tmpPckg );
-    }
-
-// ----------------------------------------------------------
-// Locally instantiate a RProperty and Set Outgoing Pair Property
-// ----------------------------------------------------------
-//
-inline void SetOutgoPairProperty(const TBTDevAddr& aAddr,
-        TBTOutgoingPairMode aMode )
-    {
-    RProperty property;
-    TInt err = property.Attach( 
-                KPSUidBluetoothEnginePrivateCategory, KBTOutgoingPairing );
-    if ( !err )
-        {
-        SetOutgoPairProperty( property, aAddr, aMode );
-        }
-    property.Close();
-    }