--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/group/remconbeareravrcp.mmp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/group/remconbeareravrcp.mmp	Wed Sep 01 12:20:04 2010 +0100
@@ -20,6 +20,8 @@
  @file
 */
 
+#include "../../../../../../os/bt/bluetoothmgmt/btcommon/config.cfg"
+
 #include <remcon/remconservercaps.mmh>
 
 TARGET        remconbeareravrcp.dll

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcpplayerinfomanager.h	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/avrcpplayerinfomanager.h	Wed Sep 01 12:20:04 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2009 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,7 +88,6 @@
 	void ClientStatus(TBool aControllerPresent, TBool aTargetPresent);	
 	TInt SetLocalAddressedClient(const TRemConClientId& aId);
 	void ControllerFeaturesUpdatedL(RArray<TUid>& aSupportedInterfaces);
-	void TargetFeaturesUpdated(const TRemConClientId& aId, TPlayerType aPlayerType, TPlayerSubType aPlayerSubType, const TDesC8& aName);
 	MIncomingCommandHandler& InternalCommandHandler();
 
 	// Interface to command handler
@@ -107,10 +106,7 @@
 	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
 //---------------------------------------------------------

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/controlbearer.h	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/controlbearer.h	Wed Sep 01 12:20:04 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2009 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,8 +118,6 @@
 	
 	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);
 	

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpincomingcommandhandler.cpp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpincomingcommandhandler.cpp	Wed Sep 01 12:20:04 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2009 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();
 		}
 

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpplayerinfomanager.cpp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/avrcpplayerinfomanager.cpp	Wed Sep 01 12:20:04 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2009 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,33 +133,7 @@
 	iUidWatcher = NULL;
 	}
 
-// 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)
+void CAvrcpPlayerInfoManager::ClientAvailable(const TRemConClientId& aId, TPlayerType aClientType, TPlayerSubType aClientSubType, const TDesC8& aName)
 	{
 	LOG_FUNC;
 	ASSERT_CONTROL_THREAD;
@@ -176,11 +150,15 @@
 	
 	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;
-	TInt err = SetItemDetails(item, aPlayerType, aPlayerSubType, aName);
+	item.iFeatureBitmask = TPlayerFeatureBitmask();
+	TInt err = SetPlayerFeatures(aId, item.iFeatureBitmask, item.iSdpFeatures, item.iAbsoluteVolumeSupport);
 
 	// Release lock before calling out of player info manager in case
 	// anyone needs to call back in - we're finished updating the
@@ -190,21 +168,41 @@
 	if(!err)
 		{
 		TRAP(err, iPlayStatusWatcher->StartWatchingPlayerL(aId));
+	
 		if(!err)
 			{
-			UpdateSdpRecord(item);
-		     for(TInt i = 0; i<iObservers.Count(); i++)
+			// Update SDP record, if this fails we carry on, it's non-fatal
+			TInt sdpErr = KErrNone;
+			if(!iTargetRecord)
 				{
-				iObservers[i]->MpcoAvailablePlayersChanged();
+				TRAP(sdpErr, AvrcpSdpUtils::CreateServiceRecordL(iSdpDatabase, 
+						iTargetRecord, 
+						ETrue, 
+						(item.iSdpFeatures & AvrcpSdp::EBrowsing) ? 
+						AvrcpSdp::KAvrcpProfileVersion14 : 
+						AvrcpSdp::KAvrcpProfileVersion13));
+				}
+			
+			if(sdpErr == KErrNone)
+				{
+				TRAP_IGNORE(UpdateTgServiceRecordL());
 				}
 			}
-		  else    
+		}
+
+	if(!err)
+		{
+		for(TInt i = 0; i<iObservers.Count(); i++)
 			{
-			iLock.Wait();
-			iPlayers[index].iId = KNullClientId;
-			iLock.Signal();
+			iObservers[i]->MpcoAvailablePlayersChanged();
 			}
 		}
+	else	
+		{
+		iLock.Wait();
+		iPlayers[index].iId = KNullClientId;
+		iLock.Signal();
+		}
 	}
 
 void CAvrcpPlayerInfoManager::ClientNotAvailable(const TRemConClientId& aId)
@@ -305,46 +303,6 @@
 	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; i<iObservers.Count(); i++)
-		{
-		iObservers[i]->MpcoAvailablePlayersChanged();
-		}
-	}
-
 MIncomingCommandHandler& CAvrcpPlayerInfoManager::InternalCommandHandler()
 	{
 	LOG_FUNC

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/playerstatewatcher.cpp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/playerstatewatcher.cpp	Wed Sep 01 12:20:04 2010 +0100
@@ -37,17 +37,14 @@
 void CPlayerWatcherBase::StopWatchingPlayer(TRemConClientId aClientId)
 	{
 	LOG_FUNC;
-	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();
-	    }
+	CInternalCommand* command = *iCommands.Find(aClientId);
+	__ASSERT_DEBUG(command, AVRCP_PANIC(ENotWatchingPlayer));
+
+	TUint transId = command->RemConCommandId();
+	iCommandInterface.MrcciCommandExpired(transId);
+
+	iCommands.Remove(aClientId);
+	command->DecrementUsers();
 	}
 
 void CPlayerWatcherBase::MessageSent(CAvrcpCommand& /*aCommand*/, TInt /*aSendResult*/)

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/remconbeareravrcp.cpp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/remconbeareravrcp.cpp	Wed Sep 01 12:20:04 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2009 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,19 +698,6 @@
 	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<TUid>& aSupportedInterfaces)
 	{
 	LOG_FUNC

--- a/bluetoothengine/btaudioman/inc/basrvacc.h	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/btaudioman/inc/basrvacc.h	Wed Sep 01 12:20:04 2010 +0100
@@ -67,11 +67,6 @@
     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);

--- a/bluetoothengine/btaudioman/inc/basrvaccstate.h	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/btaudioman/inc/basrvaccstate.h	Wed Sep 01 12:20:04 2010 +0100
@@ -102,12 +102,7 @@
     * 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.
     */

--- a/bluetoothengine/btaudioman/inc/basrvaccstateattached.h	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/btaudioman/inc/basrvaccstateattached.h	Wed Sep 01 12:20:04 2010 +0100
@@ -84,12 +84,6 @@
     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);

--- a/bluetoothengine/btaudioman/src/basrvacc.cpp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/btaudioman/src/basrvacc.cpp	Wed Sep 01 12:20:04 2010 +0100
@@ -139,12 +139,6 @@
     iState->CloseAudioL(aType);
     }
 
-void CBasrvAcc::CancelOpenAudio()
-    {
-    TRACE_FUNC
-    iState->CancelOpenAudio();
-    }
-
 const TAccInfo* CBasrvAcc::AccInfo(const TBTDevAddr& aAddr)
     {
     TRACE_FUNC

--- a/bluetoothengine/btaudioman/src/basrvaccman.cpp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/btaudioman/src/basrvaccman.cpp	Wed Sep 01 12:20:04 2010 +0100
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:  Implementation of an accessory management.
-*  Version     : %version:  14.1.12 %
+*  Version     : %version:  14.1.11 %
 *
 */
 
@@ -619,23 +619,27 @@
     TInt idx = FindAcc(aAddr);
     if (idx >= 0)
         {
-        TInt audiolinks = AudioLinkStatus();        
-        if ( audiolinks && audiolinks != aProfile) 
+        // Check if another audio link opened already
+        TInt audiolinks = AudioLinkStatus();
+        
+        if ( ( audiolinks && audiolinks != aProfile) || 
+            ( iAudioRequests.Count() && 
+              iAudioRequests[0].iOngoing && 
+              iAudioRequests[0].iAddr == aAddr) )
             {
-            TRACE_INFO((_L(" [global audio link check] existing audio link %x. Audio should be rejected!"),
+            // 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!"),
                         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);

--- a/bluetoothengine/btaudioman/src/basrvaccstate.cpp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/btaudioman/src/basrvaccstate.cpp	Wed Sep 01 12:20:04 2010 +0100
@@ -86,11 +86,6 @@
     TRACE_FUNC
     }
 
-void CBasrvAccState::CancelOpenAudio()
-    {
-    TRACE_FUNC
-    }
-
 void CBasrvAccState::CloseAudioL(TAccAudioType /*aType*/)
     {
     TRACE_FUNC
@@ -133,7 +128,7 @@
     }
 
 void CBasrvAccState::NewProfileConnection(TProfiles aProfile)
-    {    
+    {
     AccInfo().iConnProfiles |= aProfile;
     AccInfo().iSuppProfiles |= aProfile;
     if (aProfile == ERemConCT && 

--- a/bluetoothengine/btaudioman/src/basrvaccstateattached.cpp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/btaudioman/src/basrvaccstateattached.cpp	Wed Sep 01 12:20:04 2010 +0100
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:  Implementation of Connected state.
-*  Version     : %version: 22 %
+*  Version     : %version: 21 %
 *
 */
 
@@ -228,16 +228,6 @@
 	User::RequestComplete( myStatus, KErrNone );
     }
 
-void CBasrvAccStateAttached::CancelOpenAudio()
-    {
-    TRACE_FUNC
-    
-    if (iAudioOpener)
-        {
-        iAudioOpener->Cancel();
-        }
-    }
-
 void CBasrvAccStateAttached::CloseAudioL(TAccAudioType aType)
     {
     TRACE_FUNC

--- a/bluetoothengine/btaudioman/src/basrvmain.cpp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/btaudioman/src/basrvmain.cpp	Wed Sep 01 12:20:04 2010 +0100
@@ -30,8 +30,8 @@
 GLDEF_C TInt E32Main()
     {
     TRACE_STATIC_FUNC
-    //TODO uncomment UHEAP macros after orbit & Qt memory leaks are resolved till then it should be commented.
-//    __UHEAP_MARK;
+
+    __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/bteng/btbearer/inc/btpluginnotifier.h	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/bteng/btbearer/inc/btpluginnotifier.h	Wed Sep 01 12:20:04 2010 +0100
@@ -25,7 +25,6 @@
 #include <locodbearerpluginparams.h>      
 #include <centralrepository.h>      
 #include <locodbearer.h>
-#include <hbindicatorsymbian.h>
 
 
 /**
@@ -90,11 +89,6 @@
      * @since S60 v3.2
      */
     void SubscribeL();
-    
-    /**
-     * Handles service load/unload when BT power changes.
-     */
-    void HandleBtPowerChanged( TBTPowerStateValue aPower );
 
 // from base class CActive
 
@@ -150,8 +144,6 @@
      * Own.
      */
     CRepository* iSession;
-    
-    CHbIndicatorSymbian* iBTIndicator;
 
     };
 

--- a/bluetoothengine/bteng/btbearer/src/btpluginnotifier.cpp	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/bteng/btbearer/src/btpluginnotifier.cpp	Wed Sep 01 12:20:04 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -23,9 +23,6 @@
 #include "btpluginnotifier.h"
 #include "debug.h"
 #include <btfeaturescfg.h>
-#include <btnotifclient.h>
-#include "btindicatorconstants.h"
-#include <hbsymbianvariant.h>
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -62,7 +59,6 @@
 	delete repository;
 	
 	CBTEngSettings* settings = CBTEngSettings::NewL();
-	iBTIndicator = CHbIndicatorSymbian::NewL(); 
 	
 	BluetoothFeatures::TEnterpriseEnablementMode mode = BluetoothFeatures::EnterpriseEnablementL();
 	TRACE_INFO( ( _L( "mode = %d" ), mode) )
@@ -72,23 +68,15 @@
         TRACE_INFO( ( _L( "Turning BT on" ) ) )
         TInt err = settings->SetPowerState( EBTPowerOn );
         TRACE_INFO( ( _L( "SetPowerState returned %d" ), err ) )
-        if ( !err )
+        if( !err )
             {
-            HandleBtPowerChanged( EBTPowerOn );
+            iHandler.NotifyBearerStatus( ELocodBearerBT, power );
             }
         }
     else
         {
         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)
@@ -123,7 +111,6 @@
     TRACE_FUNC_ENTRY
     Cancel();
     delete iSession;
-    delete iBTIndicator;
     }
 
 
@@ -142,30 +129,6 @@
     SetActive();
     }
 
-// ---------------------------------------------------------------------------
-// Handles power state change. Inform Locod. In addition, if BT is on, start
-// btnotifier server.
-// ---------------------------------------------------------------------------
-//
-void CBTPluginNotifier::HandleBtPowerChanged( TBTPowerStateValue aPower )
-    {
-    TRACE_FUNC_ARG( ( _L( " to %d" ), aPower ) )
-    TInt err (KErrNone );
-    if ( aPower == EBTPowerOn )
-        {
-        // Start BT notifier server by creating a session with it:
-        RBTNotifier btnotif;
-        err = btnotif.Connect();
-        TRACE_INFO( ( _L( "start bt notifier server %d" ), err ) )
-        // btnotif server manages its lifecycle. no need
-        // to keep this session:
-        btnotif.Close();
-        }
-    if ( !err )
-        {
-        iHandler.NotifyBearerStatus( ELocodBearerBT, aPower );
-        }
-    }
 
 // ---------------------------------------------------------------------------
 // From class CActive.
@@ -199,12 +162,9 @@
         case EKeyInt:
             {
             TRACE_INFO( ( _L( "[CBTPluginNotifier::RunL2 %d]" ), status ) )
-            TInt newValue = EBTPowerOff;
-            TInt err = iSession->Get( iId, newValue );
-            if ( !err )
-                {
-                HandleBtPowerChanged( static_cast<TBTPowerStateValue>( newValue ) );
-                }
+            TInt newValue = 1;
+            iSession->Get( iId, newValue );
+            iHandler.NotifyBearerStatus( ELocodBearerBT, newValue );
             }
             break;
         default:

--- a/bluetoothengine/bteng/btengconnman/inc/btengconnhandler.h	Tue Aug 31 15:25:10 2010 +0300
+++ b/bluetoothengine/bteng/btengconnman/inc/btengconnhandler.h	Wed Sep 01 12:20:04 2010 +0100
@@ -146,7 +146,18 @@
      * @since S60 v3.2
      * @return ?description
      */
-    void CancelNotifyConnectionEvents();
+    TInt CancelNotifyConnectionEvents();
+
+    /**
+     * Set a pairing observer in BTEngine.
+     *
+     * @since S60 v3.2
+     * @param aAddr The address of the remote device that is being paired.
+     * @param aActivate If ETrue, the observer will be activated, otherwise
+     *                  the observer will be removed.
+     * @return KErrNone on success, otherwise a system-wide error code.
+     */
+    static TInt SetPairingObserver( const TBTDevAddr& aAddr, TBool aActivate );
 
     /**
      * ?description
@@ -155,6 +166,22 @@
      * @return ?description
      */
     inline TInt PrepareDiscovery();
+
+
+    /**
+     * Pair a device
+     *
+     * @since S60 v5.1
+     * @param aAddr the address of the device to pair with
+     * @param aDeviceClass the device class of the device to pair with
+     * @return KErrNone if this request has been accepted; an error situation otherwise.
+     */
+    TInt StartPairing( const TBTDevAddr& aAddr, const TBTDeviceClass& aDeviceClass );
+
+    /**
+     * cancel the outstanding pairing request.
+     */
+    void CancelPairing();
     
 private:
 // from base class MBTEngActiveObserver
@@ -165,22 +192,15 @@
      *
      * @since S60 v3.2
      */
-    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aStatus );
+    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aId, TInt aStatus );
 
     /**
-     * Callback for handling cancelation of an outstanding request.
-     *
-     * @param aId The ID that identifies the outstanding request.
-     */
-    virtual void CancelRequest( TInt aRequestId );
-    
-    /**
      * From MBTEngActiveObserver.
      * Handles an error during processing of connection status event.
      *
      * @since S60 v3.2
      */
-    virtual void HandleError( CBTEngActive* aActive, TInt aError );
+    virtual void HandleError( CBTEngActive* aActive, TInt aId, TInt aError );
 
 private:
 
@@ -202,6 +222,16 @@
      * Client-server package to which the event result is copied.
      */
     TBTEngEventPkg iEventPkg;
+
+    /**
+     * Address of the remote device to pair with.
+     */
+    TBTDevAddrPckgBuf iPairAddr;
+    
+    /**
+     * The CoD of the remote device to pair with.
+     */
+    TUint32 iPairDevCod;
     
     /**
      * Session with BTEng server side.
@@ -213,6 +243,12 @@
      * Own.
      */
     CBTEngActive* iConnEventActive;
+
+    /**
+     * The actual active object for pairing a device.
+     * Own.
+     */
+    CBTEngActive* iPairActive;
     
     /**
      * Reference to receiver of connection events.

--- a/bluetoothengine/bteng/btengconnman/inc/btengpairinghandler.h	Tue Aug 31 15:25:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
-* 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"
-* 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:  Bluetooth Engine API for connection management functionality.
-*
-*/
-
-#ifndef BTENGPAIRINGHANDLER_H
-#define BTENGPAIRINGHANDLER_H
-
-#include <btnotifclient.h>
-#include <btmanclient.h>
-
-#include "btengactive.h"
-
-class CBTEngConnMan;
-class MBTEngConnObserver;
-
-
-/**
- *  ?one_line_short_description
- *
- *  ?more_complete_description
- *
- *  @lib ?library
- *  @since S60 v3.2
- */
-NONSHARABLE_CLASS( CBTEngPairingHandler ) : public CBase, public MBTEngActiveObserver
-    {
-
-public:
-
-    /**
-     * Two-phase constructor
-     */
-    static CBTEngPairingHandler* NewL( MBTEngConnObserver* aObserver, 
-                                        CBTEngConnMan* aParent );
-
-    /**
-     * Destructor
-     */
-    virtual ~CBTEngPairingHandler();
-
-    /**
-     * ?description
-     *
-     * @since S60 v3.2
-     * @param ?arg1 ?description
-     * @param ?arg2 ?description
-     * @return ?description
-     */
-    void StartPairingL( const TBTDevAddr& aAddr, TBTDeviceClass& aDeviceClass );
-
-    /**
-     * ?description
-     *
-     * @since S60 v3.2
-     * @param ?arg1 ?description
-     * @param ?arg2 ?description
-     * @return ?description
-     */
-    void CancelPairing();   
-
-// from base class MBTEngActiveObserver
-
-    /**
-     * From MBTEngActiveObserver.
-     * ?description
-     *
-     * @since S60 v3.2
-     * @param ?arg1 ?description
-     */
-    virtual void RequestCompletedL( CBTEngActive* aActive, 
-                                    TInt aStatus );
-
-    /**
-     * Callback for handling cancelation of an outstanding request.
-     *
-     * @param aId The ID that identifies the outstanding request.
-     */
-    virtual void CancelRequest( TInt aRequestId );
-    
-    /**
-     * From MBTEngActiveObserver.
-     * ?description
-     *
-     * @since S60 v3.2
-     * @param ?arg1 ?description
-     */
-    virtual void HandleError( CBTEngActive* aActive, 
-                                    TInt aError );
-
-private:
-
-    /**
-     * C++ default constructor
-     */
-    CBTEngPairingHandler( MBTEngConnObserver* aObserver, 
-                           CBTEngConnMan* aParent );
-
-    /**
-     * Symbian 2nd-phase constructor
-     */
-    void ConstructL();
-
-private: // data
-
-    /**
-     * the address of the remote device to be paired.
-     */
-    TBTDevAddrPckgBuf iAddr;
-    
-    /**
-     * the class of device value of the remote device to be paired.
-     */
-    TBTDeviceClass iCod; 
-
-    /**
-     * the session to notifier which handles the actual pairing operation.
-     * Own.
-     */
-    RBTNotifier iBtNotifier;
-
-    /**
-     * Active object for pairing request
-     * Own.
-     */
-    CBTEngActive* iActive;
-
-    /**
-     * the observer that receives the result of pairing operation.
-     * Not own.
-     */
-    MBTEngConnObserver* iObserver;
-
-    /**
-     * ?description_of_pointer_member
-     * Not own.
-     */
-    CBTEngConnMan* iParent;
-
-    };
-
-
-#endif // BTENGPAIRINGHANDLER_H