--- a/bluetoothappprofiles/avrcp/avc/avcframe.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothappprofiles/avrcp/avc/avcframe.h	Fri May 14 16:01:46 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"
@@ -512,26 +512,26 @@
 // Factory pattern stuff - these are useful to do donkey work,
 // but have existing clients treat them as the base class
 
-class CAVCVendorDependentResponse
+class CAVCVendorDependentResponse			// codescanner::missingcclass
 	{
 public:
 	IMPORT_C static CAVCFrame* NewL(TUint aVendorId);
 	};
 
-class CAVCPassthroughCommand
+class CAVCPassthroughCommand				// codescanner::missingcclass
 	{
 public:
 	};
 
 // likely not have newl because dont allocate on parse pattern
-class CAVCVendorDependentCommand
+class CAVCVendorDependentCommand			// codescanner::missingcclass
 	{
 public:
 	IMPORT_C static TPtrC8 GetPayloadAndVID(const CAVCFrame& aFrame, TUint& aVID);
 	};
 	
 // likely not have newl because dont allocate on parse pattern
-class CAVCVendorUniquePassthroughCommand
+class CAVCVendorUniquePassthroughCommand	// codescanner::missingcclass
 	{
 public:
 	IMPORT_C static TPtrC8 GetPayloadAndVID(const CAVCFrame& aFrame, TUint& aVID);

--- a/bluetoothappprofiles/avrcp/mediabrowseapi/public/remconmediabrowsepanic.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothappprofiles/avrcp/mediabrowseapi/public/remconmediabrowsepanic.h	Fri May 14 16:01:46 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"
@@ -39,6 +39,7 @@
 	ESearchResultWithoutRequest = 6,
 	/** The value of the media library state cookie must not be zero. */
 	EZeroMediaLibraryStateCookie = 7,
+	EUnexpectedNullMemberField = 8,
 	};
 
 class MediaBrowsePanic

--- a/bluetoothappprofiles/avrcp/mediabrowseapi/src/remconmediabrowsetargetbase.cpp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothappprofiles/avrcp/mediabrowseapi/src/remconmediabrowsetargetbase.cpp	Fri May 14 16:01:46 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"
@@ -73,12 +73,16 @@
 	{
 	}
 
-CRemConMediaBrowseTargetBase::~CRemConMediaBrowseTargetBase()
+CRemConMediaBrowseTargetBase::~CRemConMediaBrowseTargetBase()		// codescanner::destructor
 	{
 	iMediaAttributeIds.Close();
 	iNullArray.Close();
 	iOutBuf.Close();
 	iSearchString.Close();
+
+	// iGetPathResponse, iGiaResponse and iGflResponse are instantiated in CRemConMediaBrowseTargetBase::BaseConstructL() and
+	// so should have the same lifetime as this CRemConMediaBrowseTargetBase instance
+	__ASSERT_DEBUG(iGetPathResponse && iGiaResponse && iGflResponse, MediaBrowsePanic::Panic(EUnexpectedNullMemberField));
 	iGetPathResponse->Close();
 	iGiaResponse->Close();
 	iGflResponse->Close();

--- a/bluetoothappprofiles/avrcp/playerinformation/src/playerapplicationsetting.cpp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothappprofiles/avrcp/playerinformation/src/playerapplicationsetting.cpp	Fri May 14 16:01:46 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"
@@ -30,7 +30,7 @@
 
 CPlayerApplicationSettings* CPlayerApplicationSettings::NewL( TUint aAttributeID,
 		TDesC8& 						aAttributeText,
-		RArray<TUint> 					aValues,
+		const RArray<TUint>& 			aValues,
 		RArray<TPtrC8>&					aValueTexts,
 		TUint 							aInitialValue )
 	{
@@ -55,7 +55,7 @@
 
 void CPlayerApplicationSettings::ConstructL(TUint aAttributeID,
 		TDesC8& 						aAttributeText,
-		RArray<TUint> 					aValues,
+		const RArray<TUint>& 			aValues,
 		RArray<TPtrC8>&					aValueText,
 		TUint 							aInitialValue )
 	{

--- a/bluetoothappprofiles/avrcp/playerinformation/src/playerapplicationsetting.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothappprofiles/avrcp/playerinformation/src/playerapplicationsetting.h	Fri May 14 16:01:46 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -42,7 +42,7 @@
 	*/
 	static CPlayerApplicationSettings* NewL( TUint aAttributeID,
 		TDesC8& 						aAttributeText,
-		RArray<TUint> 					aValues,
+		const RArray<TUint>& 			aValues,
 		RArray<TPtrC8>&					aValueTexts,
 		TUint 							aInitialValue );
 	
@@ -65,7 +65,7 @@
 
 	void ConstructL(TUint aAttributeID,
 		TDesC8& 						aAttributeText,
-		RArray<TUint> 					aValues,
+		const RArray<TUint>& 			aValues,
 		RArray<TPtrC8>&					aValueText,
 		TUint 							aInitialValue );
 

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/playerbitmasks.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/inc/playerbitmasks.h	Fri May 14 16:01:46 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"
@@ -176,11 +176,11 @@
 	
 	inline const TDesC8& FeatureBitmask() const;
 
-	void SetCoreApiFeatures(RArray<TUint> aOperation);
-	void SetAbsoluteVolumeApiFeatures(RArray<TUint> aOperation);
-	void SetGroupNavigationApiFeatures(RArray<TUint> aOperation);
-	void SetNowPlayingApiFeatures(RArray<TUint> aOperation);
-	void SetMediaBrowseApiFeatures(RArray<TUint> aOperation);
+	void SetCoreApiFeatures(const RArray<TUint>& aOperation);
+	void SetAbsoluteVolumeApiFeatures(const RArray<TUint>& aOperation);
+	void SetGroupNavigationApiFeatures(const RArray<TUint>& aOperation);
+	void SetNowPlayingApiFeatures(const RArray<TUint>& aOperation);
+	void SetMediaBrowseApiFeatures(const RArray<TUint>& aOperation);
 
 private:
 	void SetCoreApiFeatures();

--- a/bluetoothappprofiles/avrcp/remconbeareravrcp/src/playerbitmasks.cpp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothappprofiles/avrcp/remconbeareravrcp/src/playerbitmasks.cpp	Fri May 14 16:01:46 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"
@@ -33,7 +33,7 @@
 	iFeatureBitmask.Copy(aFeatureBitmask.FeatureBitmask());
 	}
 
-void TPlayerFeatureBitmask::SetCoreApiFeatures(RArray<TUint> aOperation)
+void TPlayerFeatureBitmask::SetCoreApiFeatures(const RArray<TUint>& aOperation)
 	{
 	if(aOperation.Count() > 0)
 		{
@@ -282,7 +282,7 @@
 	iFeatureBitmask[EF5ByteOffset]|= (1<<EF5BitOffset);
 	}
 
-void TPlayerFeatureBitmask::SetAbsoluteVolumeApiFeatures(RArray<TUint> aOperation)
+void TPlayerFeatureBitmask::SetAbsoluteVolumeApiFeatures(const RArray<TUint>& aOperation)
 	{
 	if(aOperation.Count())
 		{
@@ -290,7 +290,7 @@
 		}
 	}
 
-void TPlayerFeatureBitmask::SetGroupNavigationApiFeatures(RArray<TUint> aOperation)
+void TPlayerFeatureBitmask::SetGroupNavigationApiFeatures(const RArray<TUint>& aOperation)
 	{
 	if(aOperation.Count())
 		{
@@ -299,7 +299,7 @@
 		}
 	}
 
-void TPlayerFeatureBitmask::SetNowPlayingApiFeatures(RArray<TUint> aOperation)
+void TPlayerFeatureBitmask::SetNowPlayingApiFeatures(const RArray<TUint>& aOperation)
 	{
 	if(aOperation.Count())
 		{
@@ -313,7 +313,7 @@
 		}
 	}
 
-void TPlayerFeatureBitmask::SetMediaBrowseApiFeatures(RArray<TUint> aOperation)
+void TPlayerFeatureBitmask::SetMediaBrowseApiFeatures(const RArray<TUint>& aOperation)
 	{
 	if(aOperation.Count())
 		{

--- a/bluetoothengine/bteng/btbearer/inc/btpluginnotifier.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/btbearer/inc/btpluginnotifier.h	Fri May 14 16:01:46 2010 +0300
@@ -89,6 +89,11 @@
      * @since S60 v3.2
      */
     void SubscribeL();
+    
+    /**
+     * Handles service load/unload when BT power changes.
+     */
+    void HandleBtPowerChanged( TBTPowerStateValue aPower );
 
 // from base class CActive
 

--- a/bluetoothengine/bteng/btbearer/src/btpluginnotifier.cpp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/btbearer/src/btpluginnotifier.cpp	Fri May 14 16:01:46 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -23,6 +23,7 @@
 #include "btpluginnotifier.h"
 #include "debug.h"
 #include <btfeaturescfg.h>
+#include <btnotifclient.h>
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -68,9 +69,9 @@
         TRACE_INFO( ( _L( "Turning BT on" ) ) )
         TInt err = settings->SetPowerState( EBTPowerOn );
         TRACE_INFO( ( _L( "SetPowerState returned %d" ), err ) )
-        if( !err )
+        if ( !err )
             {
-            iHandler.NotifyBearerStatus( ELocodBearerBT, power );
+            HandleBtPowerChanged( EBTPowerOn );
             }
         }
     else
@@ -129,6 +130,30 @@
     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.
@@ -162,9 +187,12 @@
         case EKeyInt:
             {
             TRACE_INFO( ( _L( "[CBTPluginNotifier::RunL2 %d]" ), status ) )
-            TInt newValue = 1;
-            iSession->Get( iId, newValue );
-            iHandler.NotifyBearerStatus( ELocodBearerBT, newValue );
+            TInt newValue = EBTPowerOff;
+            TInt err = iSession->Get( iId, newValue );
+            if ( !err )
+                {
+                HandleBtPowerChanged( static_cast<TBTPowerStateValue>( newValue ) );
+                }
             }
             break;
         default:

--- a/bluetoothengine/bteng/btengconnman/inc/btengconnhandler.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/btengconnman/inc/btengconnhandler.h	Fri May 14 16:01:46 2010 +0300
@@ -146,18 +146,7 @@
      * @since S60 v3.2
      * @return ?description
      */
-    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 );
+    void CancelNotifyConnectionEvents();
 
     /**
      * ?description
@@ -166,22 +155,6 @@
      * @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
@@ -192,15 +165,22 @@
      *
      * @since S60 v3.2
      */
-    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aId, TInt aStatus );
+    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.
      * Handles an error during processing of connection status event.
      *
      * @since S60 v3.2
      */
-    virtual void HandleError( CBTEngActive* aActive, TInt aId, TInt aError );
+    virtual void HandleError( CBTEngActive* aActive, TInt aError );
 
 private:
 
@@ -222,16 +202,6 @@
      * 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.
@@ -243,12 +213,6 @@
      * Own.
      */
     CBTEngActive* iConnEventActive;
-
-    /**
-     * The actual active object for pairing a device.
-     * Own.
-     */
-    CBTEngActive* iPairActive;
     
     /**
      * Reference to receiver of connection events.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bluetoothengine/bteng/btengconnman/inc/btengpairinghandler.h	Fri May 14 16:01:46 2010 +0300
@@ -0,0 +1,155 @@
+/*
+* 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

--- a/bluetoothengine/bteng/btengconnman/src/btengconnhandler.cpp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/btengconnman/src/btengconnhandler.cpp	Fri May 14 16:01:46 2010 +0300
@@ -83,7 +83,6 @@
     {
     TRACE_FUNC_ENTRY
     CancelNotifyConnectionEvents();
-    CancelPairing();
     iBTEng.Close();
     }
 
@@ -146,128 +145,52 @@
 // ?implementation_description
 // ---------------------------------------------------------------------------
 //
-TInt CBTEngConnHandler::CancelNotifyConnectionEvents()
-    {
-    TRACE_FUNC_ENTRY
-    TInt err = KErrNone;
-    if( iConnEventActive && iConnEventActive->IsActive() )
-        {
-        err = iBTEng.CancelNotifyConnectionEvents();
-        iConnEventActive->CancelRequest();
-        }
-    delete iConnEventActive;
-    iConnEventActive = NULL;
-    return err;
-    }
-
-// -----------------------------------------------------------------------------
-// Request server side to activate/deactivate a pair observer
-// -----------------------------------------------------------------------------
-//
-TInt CBTEngConnHandler::SetPairingObserver( const TBTDevAddr& aAddr, 
-    TBool aActivate )
-    {
-    RBTEng bteng;
-    TInt err = bteng.Connect();
-    if ( !err )
-        {
-        err = bteng.SetPairingObserver( aAddr, aActivate );
-        }
-    bteng.Close();
-    return err;
-    }
-
-// ---------------------------------------------------------------------------
-// Request BTEng to pair the device
-// ---------------------------------------------------------------------------
-//
-TInt CBTEngConnHandler::StartPairing( const TBTDevAddr& aAddr, 
-    const TBTDeviceClass& aDeviceClass )
+void CBTEngConnHandler::CancelNotifyConnectionEvents()
     {
     TRACE_FUNC_ENTRY
-    TInt err( KErrNone );
-    if( iPairActive && iPairActive->IsActive() )
-        {
-        err = KErrServerBusy;
-        }
-    
-    if( !iPairActive )
-        {
-            // Use a higher prioritty than normal, because we want 
-            // to be notified fast (e.g. to update the UI).
-        TRAP( err, iPairActive = CBTEngActive::NewL( *this, EPairDeviceId, 
-                                                  CActive::EPriorityUserInput ) );
-        }
-    if ( !err )
-        {
-        iPairAddr() = aAddr;
-        iPairDevCod = aDeviceClass.DeviceClass();
-        iBTEng.PairDevice( iPairAddr, iPairDevCod, iPairActive->RequestStatus() );
-        iPairActive->GoActive();
-        }
-    TRACE_FUNC_EXIT
-    return err;
+    delete iConnEventActive;
+    iConnEventActive = NULL;
     }
 
 // ---------------------------------------------------------------------------
-// Cancel any outstanding operation, free resources.
-// ---------------------------------------------------------------------------
-//
-void CBTEngConnHandler::CancelPairing()
-    {
-    TRACE_FUNC_ENTRY
-    if( iPairActive && iPairActive->IsActive() )
-        {
-        iBTEng.CancelPairDevice();
-        }
-    delete iPairActive;
-    iPairActive = NULL;
-    TRACE_FUNC_EXIT
-    }
-
-
-// ---------------------------------------------------------------------------
 // From class MBTEngActiveObserver.
 // Called by the active object when a change in connection status has occured.
 // ---------------------------------------------------------------------------
 //
-void CBTEngConnHandler::RequestCompletedL( CBTEngActive* aActive, TInt aId, 
+void CBTEngConnHandler::RequestCompletedL( CBTEngActive* aActive, 
     TInt aStatus )
     {
-    TRACE_FUNC_ARG( ( _L( "ID: %d status: %d" ), aId, aStatus ) )
-
+    TRACE_FUNC_ARG( ( _L( "ID: %d status: %d" ), aActive->RequestId(), aStatus ) )
     (void) aActive;
-    switch ( aId )
-        {
-        case EConnectionEventId:
-            {
-            HandleConnectionEvent( aStatus );
-            break;
-            }
-        case EPairDeviceId:
-            {
-            if ( iObserver )
-                {
-                iObserver->PairingComplete( iPairAddr(), aStatus );
-                }
-            }
-        }
-
+    ASSERT( aActive->RequestId() == EConnectionEventId );
+    HandleConnectionEvent( aStatus );
     TRACE_FUNC_EXIT
     }
 
+// ---------------------------------------------------------------------------
+// From class MBTEngActiveObserver.
+// Handles cancelation of an outstanding request
+// ---------------------------------------------------------------------------
+//
+void CBTEngConnHandler::CancelRequest( TInt aRequestId )
+    {
+    TRACE_FUNC_ARG( ( _L( "reqID %d" ), aRequestId ) )
+    ASSERT( aRequestId == EConnectionEventId );
+    ( void ) aRequestId;
+    iBTEng.CancelNotifyConnectionEvents();
+    TRACE_FUNC_EXIT 
+    }
 
 // ---------------------------------------------------------------------------
 // From class MBTEngActiveObserver.
 // Called when RequestCompletedL/RunL leaves.
 // ---------------------------------------------------------------------------
 //
-void CBTEngConnHandler::HandleError( CBTEngActive* aActive, TInt aId, TInt aError )
+void CBTEngConnHandler::HandleError( CBTEngActive* aActive, TInt aError )
     {
     TRACE_FUNC_ARG( ( _L( "error: %d" ), aError ) )
         // Should any info be passed to the client??
     (void) aActive;
-    (void) aId;
     (void) aError;
     }
 

--- a/bluetoothengine/bteng/btengconnman/src/btengconnman.cpp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/btengconnman/src/btengconnman.cpp	Fri May 14 16:01:46 2010 +0300
@@ -23,6 +23,7 @@
 
 #include "btengconnman.h"
 #include "btengconnhandler.h"
+#include "btengpairinghandler.h"
 #include "debug.h"
 
 // ======== MEMBER FUNCTIONS ========
@@ -92,6 +93,7 @@
     {
     TRACE_FUNC_ENTRY
     delete iConnHandler;
+    delete iPairingHandler;
     }
 
 
@@ -224,10 +226,21 @@
 EXPORT_C TInt CBTEngConnMan::PairDevice( const TBTDevAddr& aAddr, TBTDeviceClass aDeviceClass )
     {
     TRACE_FUNC_ENTRY
-    return  iConnHandler->StartPairing( aAddr, aDeviceClass );
+    TInt err = KErrNone;
+    if( !iPairingHandler )
+        {
+        TRAP( err, iPairingHandler = CBTEngPairingHandler::NewL( iObserver, this ) );
+        }
+    if( !err )
+        {
+        iPairingHandler->CancelPairing();
+
+        TRAP( err, iPairingHandler->StartPairingL( aAddr, aDeviceClass ) );
+        }
+    TRACE_FUNC_RES( ( _L( "result: %d" ), err ) )
+    return err;
     }
 
-
 // ---------------------------------------------------------------------------
 // Cancels an ongoing pairing.
 // ---------------------------------------------------------------------------
@@ -235,21 +248,25 @@
 EXPORT_C void CBTEngConnMan::CancelPairDevice()
     {
     TRACE_FUNC_ENTRY
-    if( iConnHandler )
+    if( iPairingHandler )
         {
-        iConnHandler->CancelPairing();
+        iPairingHandler->CancelPairing();
+        delete iPairingHandler;
+        iPairingHandler = NULL;
         }
     }
 
 
 // ---------------------------------------------------------------------------
 // Tell BTEng to start observing the status of an ongoing pairing.
+// Deprecated since Symbian^4.
 // ---------------------------------------------------------------------------
 //
 EXPORT_C TInt CBTEngConnMan::StartPairingObserver( const TBTDevAddr& aAddr )
     {
     TRACE_FUNC_ENTRY
-    return CBTEngConnHandler::SetPairingObserver( aAddr, ETrue );
+    (void) aAddr;
+    return KErrNone;
     }
 
 
@@ -264,13 +281,14 @@
     }
 
 // ---------------------------------------------------------------------------
-// ?implementation_description
+// Deprecated since Symbian^4.
 // ---------------------------------------------------------------------------
 //
 EXPORT_C TInt CBTEngConnMan::StopPairingObserver( const TBTDevAddr& aAddr )
     {
     TRACE_FUNC_ENTRY
-    return CBTEngConnHandler::SetPairingObserver( aAddr, EFalse );
+    (void) aAddr;
+    return KErrNone;
     }
 
 // ---------------------------------------------------------------------------

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bluetoothengine/bteng/btengconnman/src/btengpairinghandler.cpp	Fri May 14 16:01:46 2010 +0300
@@ -0,0 +1,152 @@
+/*
+* 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:  Implementation of pairing a Bluetooth device.
+*
+*/
+#include "btengpairinghandler.h"
+#include "btengconnman.h"
+#include "btengactive.h"
+#include "debug.h"
+
+const TInt KPairingRequestId = 60;
+
+// ======== MEMBER FUNCTIONS ========
+
+// ---------------------------------------------------------------------------
+// C++ default constructor
+// ---------------------------------------------------------------------------
+//
+CBTEngPairingHandler::CBTEngPairingHandler( MBTEngConnObserver* aObserver, 
+    CBTEngConnMan* aParent )
+:   iObserver( aObserver ),
+    iParent( aParent )
+    {
+    }
+
+
+// ---------------------------------------------------------------------------
+// Symbian 2nd-phase constructor
+// ---------------------------------------------------------------------------
+//
+void CBTEngPairingHandler::ConstructL()
+    {
+    ASSERT( iObserver );
+    iActive = CBTEngActive::NewL( *this, KPairingRequestId, 
+                                   CActive::EPriorityStandard );
+    }
+
+
+// ---------------------------------------------------------------------------
+// NewL
+// ---------------------------------------------------------------------------
+//
+CBTEngPairingHandler* CBTEngPairingHandler::NewL( MBTEngConnObserver* aObserver, 
+    CBTEngConnMan* aParent )
+    {
+    CBTEngPairingHandler* self = new( ELeave ) CBTEngPairingHandler( aObserver, 
+                                                                      aParent );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+
+// ---------------------------------------------------------------------------
+// Destructor
+// ---------------------------------------------------------------------------
+//
+CBTEngPairingHandler::~CBTEngPairingHandler()
+    {
+    delete iActive;
+    iBtNotifier.Close();
+    }
+
+// ---------------------------------------------------------------------------
+// ?implementation_description
+// ---------------------------------------------------------------------------
+//
+void CBTEngPairingHandler::StartPairingL( const TBTDevAddr& aAddr, 
+        TBTDeviceClass& aDeviceClass  )
+    {
+    TRACE_FUNC_ENTRY
+    if ( !iBtNotifier.Handle() ) 
+        {
+        User::LeaveIfError( iBtNotifier.Connect() );
+        }
+    iAddr() = aAddr;
+    iCod = aDeviceClass;
+    iBtNotifier.PairDevice( iAddr, iCod.DeviceClass(), iActive->RequestStatus() );
+    iActive->GoActive();
+    TRACE_FUNC_EXIT
+    }
+
+// ---------------------------------------------------------------------------
+// Cancel a pairing request.
+// ---------------------------------------------------------------------------
+//
+void CBTEngPairingHandler::CancelPairing()
+    {
+    TRACE_FUNC_ENTRY
+    if( iActive->IsActive() )
+        {
+        iBtNotifier.CancelPairDevice();
+        iActive->Cancel();
+        }
+    }
+
+// ---------------------------------------------------------------------------
+// From class MBTEngActiveObserver.
+// ?implementation_description
+// ---------------------------------------------------------------------------
+//
+void CBTEngPairingHandler::RequestCompletedL( CBTEngActive* aActive, 
+    TInt aStatus )
+    {
+    TRACE_FUNC_ARG( ( _L( "status: %d" ), aStatus ) )
+    ASSERT( aActive->RequestId() != 0 );
+    (void) aActive;
+    // Pairing completes, inform client.
+    iObserver->PairingComplete( iAddr(), aStatus );
+    TRACE_FUNC_EXIT
+    }
+
+// ---------------------------------------------------------------------------
+// From class MBTEngActiveObserver.
+// Handles cancelation of an outstanding request
+// ---------------------------------------------------------------------------
+//
+void CBTEngPairingHandler::CancelRequest( TInt aRequestId )
+    {
+    TRACE_FUNC_ARG( ( _L( "reqID %d" ), aRequestId ) );
+    if ( aRequestId == KPairingRequestId )
+        {
+        iBtNotifier.CancelPairDevice();
+        }
+    TRACE_FUNC_EXIT 
+    }
+
+// ---------------------------------------------------------------------------
+// From class MBTEngActiveObserver.
+// ?implementation_description
+// ---------------------------------------------------------------------------
+//
+void CBTEngPairingHandler::HandleError( CBTEngActive* aActive, 
+    TInt aError )
+    {
+    // Our RunL can actually not leave, so we should never reach here.
+    (void) aActive;
+    (void) aError;
+    }
+

--- a/bluetoothengine/bteng/btengdiscovery/inc/btengdevicesearch.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/btengdiscovery/inc/btengdevicesearch.h	Fri May 14 16:01:46 2010 +0300
@@ -89,16 +89,23 @@
      * @since S60 v3.2
      * @param ?arg1 ?description
      */
-    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aId, 
+    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 );
+    
     /**
      * Callback to notify that an error has occurred in RunL.
      *
      * @since S60 v3.2
      * @param ?arg1 ?description
      */
-    virtual void HandleError( CBTEngActive* aActive, TInt aId, TInt aError );
+    virtual void HandleError( CBTEngActive* aActive, TInt aError );
 
 private:
 

--- a/bluetoothengine/bteng/btengdiscovery/src/btengdevicesearch.cpp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/btengdiscovery/src/btengdevicesearch.cpp	Fri May 14 16:01:46 2010 +0300
@@ -72,11 +72,6 @@
 //
 CBTEngDeviceSearch::~CBTEngDeviceSearch()
     {
-    if( iNotifier.Handle()&& iActive->IsActive())
-       {
-       iNotifier.CancelNotifier( KDeviceSelectionNotifierUid );
-       iActive->CancelRequest();
-       }
     delete iActive;
     iNotifier.Close();
     iHostResolver.Close();
@@ -132,20 +127,17 @@
     TRACE_FUNC_ENTRY
     if( iActive->IsActive() && iClientReq == EDeviceSearch)
         {
+        iActive->Cancel();
         if (iActive->RequestId() == KDevSearchAoReqId)
             {
-            iNotifier.CancelNotifier( KDeviceSelectionNotifierUid );
-            iActive->CancelRequest();
             iNotifier.Close();
             NotifyClient(KErrAbort);
             }
         else if (iActive->RequestId() == KDevEirServiceListAoReqId)
             {
-            iHostResolver.Cancel();
             iHostResolver.Close();
             }
         }
-    
     TRACE_FUNC_EXIT
     }
 
@@ -182,7 +174,7 @@
     TRACE_FUNC_ENTRY
     if( iActive->IsActive() && iClientReq == EGetDeviceEir)
         {
-        iHostResolver.Cancel();
+        iActive->Cancel();
         iHostResolver.Close();
         }
     TRACE_FUNC_EXIT
@@ -193,16 +185,16 @@
 // Callback to notify that an outstanding request has completed.
 // ---------------------------------------------------------------------------
 //
-void CBTEngDeviceSearch::RequestCompletedL( CBTEngActive* aActive, TInt aId, 
+void CBTEngDeviceSearch::RequestCompletedL( CBTEngActive* aActive, 
     TInt aStatus )
     {
     TRACE_FUNC_ARG( ( _L( "status: %d") , aStatus ) )
     (void) aActive;
-    if ( aId == KDevSearchAoReqId )
+    if ( aActive->RequestId() == KDevSearchAoReqId )
         {
         HandleDeviceSelectionResultL(aStatus);
         }
-    else if (aId == KDevEirServiceListAoReqId)
+    else if ( aActive->RequestId() == KDevEirServiceListAoReqId )
         {
         HandleDeviceEirDataResult( aStatus );
         }
@@ -211,15 +203,33 @@
 
 // ---------------------------------------------------------------------------
 // From class MBTEngActiveObserver.
+// Handles cancelation of an outstanding request
+// ---------------------------------------------------------------------------
+//
+void CBTEngDeviceSearch::CancelRequest( TInt aRequestId )
+    {
+    TRACE_FUNC_ARG( ( _L( "reqID %d" ), aRequestId ) )
+    if ( aRequestId == KDevSearchAoReqId )
+        {
+        iNotifier.CancelNotifier( KDeviceSelectionNotifierUid );
+        }
+    else if ( aRequestId == KDevEirServiceListAoReqId )
+        {
+        iHostResolver.Cancel();
+        }
+    TRACE_FUNC_EXIT 
+    }
+
+// ---------------------------------------------------------------------------
+// From class MBTEngActiveObserver.
 // Callback to notify that an error has occurred in RunL.
 // ---------------------------------------------------------------------------
 //
-void CBTEngDeviceSearch::HandleError( CBTEngActive* aActive, TInt aId, 
+void CBTEngDeviceSearch::HandleError( CBTEngActive* aActive, 
     TInt aError )
     {
     TRACE_FUNC_ARG( ( _L( "error: %d") , aError ) )
     (void) aActive;
-    (void) aId;
     iNotifier.Close();
     iHostResolver.Close();
     NotifyClient(aError);

--- a/bluetoothengine/bteng/btengsettings/inc/btengsettingsnotify.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/btengsettings/inc/btengsettingsnotify.h	Fri May 14 16:01:46 2010 +0300
@@ -78,17 +78,24 @@
      * @since S60 v3.2
      * @param ?arg1 ?description
      */
-    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aId, 
+    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.
      * Handle an error in the setting change handling.
      *
      * @since S60 v3.2
      * @param ?arg1 ?description
      */
-    virtual void HandleError( CBTEngActive* aActive, TInt aId, TInt aError );
+    virtual void HandleError( CBTEngActive* aActive, TInt aError );
 
 private:
 

--- a/bluetoothengine/bteng/btengsettings/src/btengsettingsnotify.cpp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/btengsettings/src/btengsettingsnotify.cpp	Fri May 14 16:01:46 2010 +0300
@@ -90,22 +90,11 @@
 //
 CBTEngSettingsNotify::~CBTEngSettingsNotify()
     {
-    if ( iPowerKeyCenRep )
-        {
-        iPowerKeyCenRep->NotifyCancel( KBTPowerState );
-        }
-    delete iPowerKeyWatcher;     // Will call Cancel()
+    delete iPowerKeyWatcher;
     delete iPowerKeyCenRep;
-    if ( iVisiKeyCenRep )
-        {
-   	    iVisiKeyCenRep->NotifyCancel( KBTDiscoverable );
-   	    }
-    delete iVisiKeyWatcher;   // Will call Cancel()
+    delete iVisiKeyWatcher;
     delete iVisiKeyCenRep;
-    if( iBTeng.Handle() )
-        {
-        iBTeng.Close();
-        }
+    iBTeng.Close();
     }
 
 	
@@ -138,12 +127,12 @@
 // Handles notification of a setting change, and informs our observer.
 // ---------------------------------------------------------------------------
 //
-void CBTEngSettingsNotify::RequestCompletedL( CBTEngActive* aActive, TInt aId, 
+void CBTEngSettingsNotify::RequestCompletedL( CBTEngActive* aActive, 
     TInt aStatus )
     {
-    TRACE_FUNC_ARG( ( _L( "Id(%d), status(%d)" ), aId, aStatus ) )
+    TRACE_FUNC_ARG( ( _L( "Id(%d), status(%d)" ), aActive->RequestId(), aStatus ) )
 
-    if( aId == KPowerKeyReqId && aStatus == KBTPowerState )
+    if( aActive->RequestId() == KPowerKeyReqId && aStatus == KBTPowerState )
         {
         iPowerKeyCenRep->NotifyRequest( KBTPowerState, 
                                          iPowerKeyWatcher->RequestStatus() );
@@ -155,7 +144,7 @@
             iObserver->PowerStateChanged( (TBTPowerStateValue) value );
             }
         }
-    else if( aId == KVisibilityKeyReqId && aStatus == KBTDiscoverable )
+    else if( aActive->RequestId() == KVisibilityKeyReqId && aStatus == KBTDiscoverable )
         {
         iVisiKeyCenRep->NotifyRequest( KBTDiscoverable, 
                                         iVisiKeyWatcher->RequestStatus() );
@@ -172,23 +161,42 @@
             // Coudl be a repository-wide reset (KInvalidNotificationId),
             // or an invalid key ID. Anyway we know the ID of the active
             // object, so we can just reset the watcher.
-        HandleError( aActive, aId, aStatus );
+        HandleError( aActive, aStatus );
         }
     TRACE_FUNC_EXIT
     }
 
+// ---------------------------------------------------------------------------
+// From class MBTEngActiveObserver.
+// Handles cancelation of an outstanding request
+// ---------------------------------------------------------------------------
+//
+void CBTEngSettingsNotify::CancelRequest( TInt aRequestId )
+    {
+    TRACE_FUNC_ARG( ( _L( "reqID %d" ), aRequestId ) )
+
+    if( aRequestId == KPowerKeyReqId )
+        {
+        iPowerKeyCenRep->NotifyCancel( KBTPowerState );
+        }
+    else if( aRequestId == KVisibilityKeyReqId )
+        {
+        iVisiKeyCenRep->NotifyCancel( KBTDiscoverable );
+        }
+    TRACE_FUNC_EXIT 
+    }
 
 // ---------------------------------------------------------------------------
 // From class MBTEngCenRepNotify.
 // Handles error situation by just re-ordering notification from CenRep.
 // ---------------------------------------------------------------------------
 //
-void CBTEngSettingsNotify::HandleError( CBTEngActive* aActive, TInt aId, 
+void CBTEngSettingsNotify::HandleError( CBTEngActive* aActive,
     TInt aError )
     {
-    TRACE_FUNC_ARG( ( _L( "Id(%d), status(%d)" ), aId, aError ) )
+    TRACE_FUNC_ARG( ( _L( "Id(%d), status(%d)" ), aActive->RequestId(), aError ) )
     (void) aError;
-    if( aId == KPowerKeyReqId )
+    if( aActive->RequestId() == KPowerKeyReqId )
         {
         delete iPowerKeyCenRep;
         iPowerKeyCenRep = NULL;
@@ -201,7 +209,7 @@
             aActive->GoActive();
             }
         }
-    else if( aId == KVisibilityKeyReqId )
+    else if( aActive->RequestId() == KVisibilityKeyReqId )
         {
         delete iVisiKeyCenRep;
         iVisiKeyCenRep = NULL;

--- a/bluetoothengine/bteng/bttoggle/src/bttoggle.cpp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/bttoggle/src/bttoggle.cpp	Fri May 14 16:01:46 2010 +0300
@@ -360,7 +360,8 @@
 //
 TInt CBTToggle::RunError(TInt aError)
     {	  
-    TRACE_INFO((_L("[BTENG][BTTOGGLE] RunError %d"), aError ))	
+    TRACE_INFO((_L("[BTENG][BTTOGGLE] RunError %d"), aError ))
+    (void) aError;
     iActiveNotifier = ENoneQuery;
     CActiveScheduler::Stop();
     return KErrNone;

--- a/bluetoothengine/bteng/group/bld.inf	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/group/bld.inf	Fri May 14 16:01:46 2010 +0300
@@ -26,8 +26,8 @@
 PRJ_EXPORTS
 ../inc/btengprivatecrkeys.h                 |../../inc/btengprivatecrkeys.h
 ../inc/btengprivatepskeys.h                 |../../inc/btengprivatepskeys.h
-../inc/btotgpairpub.inl                     |../../inc/btotgpairpub.inl
 ../inc/btengutil.h                          |../../inc/btengutil.h
+
 ../rom/bteng.iby                            CORE_MW_LAYER_IBY_EXPORT_PATH(bteng.iby)
 ../data/10204DA9.xml                        z:/private/2000B187/10204DA9.xml
 

--- a/bluetoothengine/bteng/group/btbearer.mmp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/group/btbearer.mmp	Fri May 14 16:01:46 2010 +0300
@@ -37,7 +37,7 @@
 TARGET                  btbearer.rsc
 END // RESOURCE
 
-USERINCLUDE             ../inc
+USERINCLUDE             ../inc ../../inc
 USERINCLUDE             ../btbearer/inc
 
 MW_LAYER_SYSTEMINCLUDE
@@ -49,4 +49,5 @@
 LIBRARY                 centralrepository.lib
 LIBRARY                 btengsettings.lib
 LIBRARY                 btfeatures.lib
+LIBRARY                 btnotifclient.lib
 DEBUGLIBRARY            flogger.lib             // File logging services

--- a/bluetoothengine/bteng/group/bteng.mmp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/group/bteng.mmp	Fri May 14 16:01:46 2010 +0300
@@ -35,10 +35,6 @@
 SOURCE                  btengsrvbbconnectionmgr.cpp
 SOURCE                  btengsdpdbhandler.cpp
 SOURCE                  btengsrvkeywatcher.cpp
-SOURCE                  btengpairman.cpp
-SOURCE                  btengpairbase.cpp
-SOURCE                  btengincpair.cpp 
-SOURCE                  btengotgpair.cpp
 SOURCE                  btengsrvsettingsmgr.cpp
 START RESOURCE          ../data/btengsdp.rss
 HEADER

--- a/bluetoothengine/bteng/group/btengconnman.mmp	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/group/btengconnman.mmp	Fri May 14 16:01:46 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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,17 +29,19 @@
 SOURCEPATH              ../btengconnman/src
 SOURCE                  btengconnman.cpp
 SOURCE                  btengconnhandler.cpp
+SOURCE                  btengpairinghandler.cpp
 SOURCEPATH              ../src
 SOURCE                  btengclient.cpp
 
 USERINCLUDE             ../inc
 USERINCLUDE             ../btengconnman/inc
+SYSTEMINCLUDE           ../../inc
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY                 euser.lib
 LIBRARY                 btdevice.lib
 LIBRARY                 bluetooth.lib
-LIBRARY                 esock.lib
+LIBRARY                 btnotifclient.lib
 LIBRARY                 featmgr.lib
 LIBRARY                 centralrepository.lib               // Central Repository
 DEBUGLIBRARY            flogger.lib

--- a/bluetoothengine/bteng/inc/btengactive.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengactive.h	Fri May 14 16:01:46 2010 +0300
@@ -40,7 +40,6 @@
  */
 class MBTEngActiveObserver
     {
-
 public:
 
     /**
@@ -48,25 +47,27 @@
      *
      * @since S60 v3.2
      * @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 ) = 0;
+    virtual void RequestCompletedL( CBTEngActive* aActive, TInt aStatus ) = 0;
+
+    /**
+     * Callback for handling cancelation of an outstanding request.
+     *
+     * @since Symbian^4
+     * @param aId The ID that identifies the outstanding request.
+     */
+    virtual void CancelRequest( TInt aRequestId ) = 0;
 
     /**
      * Callback to notify that an error has occurred in RunL.
      *
      * @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.
+     * @param aError The error occurred in RunL.
      */
-    virtual void HandleError( CBTEngActive* aActive, TInt aId, 
-                                    TInt aError ) = 0;
-
+    virtual void HandleError( CBTEngActive* aActive, TInt aError ) = 0;
     };
 
-
 /**
  *  Class CBTEngActive
  *
@@ -122,13 +123,6 @@
     inline void GoActive();
 
     /**
-     * Cancel an outstanding request.
-     *
-     * @since S60 v3.2
-     */
-    inline void CancelRequest();
-
-    /**
      * Get a reference to the active object request status.
      *
      * @since S60 v3.2
@@ -136,6 +130,7 @@
      */
     TRequestStatus& RequestStatus();
 
+private:
 // from base class CActive
 
     /**

--- a/bluetoothengine/bteng/inc/btengactive.inl	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengactive.inl	Fri May 14 16:01:46 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -73,10 +73,9 @@
 //
 inline void CBTEngActive::DoCancel()
     {
+    iObserver.CancelRequest( iRequestId );
     }
 
-
-
 // -----------------------------------------------------------------------------
 // Get the identifier of this instance.
 // -----------------------------------------------------------------------------
@@ -106,17 +105,6 @@
     SetActive();
     }
 
-
-// -----------------------------------------------------------------------------
-// Cancel an outstanding request.
-// -----------------------------------------------------------------------------
-//
-inline void CBTEngActive::CancelRequest()
-    {
-    Cancel();
-    }
-
-
 // -----------------------------------------------------------------------------
 // Get a reference to the active object request status.
 // -----------------------------------------------------------------------------
@@ -126,7 +114,6 @@
     return iStatus;
     }
 
-
 // ---------------------------------------------------------------------------
 // From class CActive.
 // Called by the active scheduler when the request has been completed.
@@ -134,7 +121,7 @@
 //
 inline void CBTEngActive::RunL()
     {
-    iObserver.RequestCompletedL( this, iRequestId, iStatus.Int() );
+    iObserver.RequestCompletedL( this, iStatus.Int() );
     }
 
 
@@ -145,6 +132,6 @@
 //
 inline TInt CBTEngActive::RunError( TInt aError )
     {
-    iObserver.HandleError( this, iRequestId, aError );
+    iObserver.HandleError( this, aError );
     return KErrNone;
     }

--- a/bluetoothengine/bteng/inc/btengclient.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengclient.h	Fri May 14 16:01:46 2010 +0300
@@ -158,17 +158,6 @@
      * @return ?description
      */
     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.
-     */
-    TInt SetPairingObserver( const TBTDevAddr& aAddr, TBool aActivate );
 
     /**
      * ?description
@@ -178,21 +167,6 @@
      */
     TInt PrepareDiscovery();
     
-    /**
-     * Pair a device.
-     * @param aAddr The address of the remote device to be paired.
-     * @param aDeviceClass the CoD of the device to be paired.
-     * @param aStatus contains the pair result at request completion.
-     */
-    void PairDevice( const TBTDevAddrPckgBuf& aAddr, 
-                     const TUint32& aDeviceClass, 
-                     TRequestStatus& aStatus  );
-    
-    /**
-     * Cancels an outstanding pair request
-     */
-    void CancelPairDevice();
-    
     };
 
 

--- a/bluetoothengine/bteng/inc/btengclientserver.h	Mon May 03 12:40:50 2010 +0300
+++ b/bluetoothengine/bteng/inc/btengclientserver.h	Fri May 14 16:01:46 2010 +0300
@@ -55,9 +55,6 @@
     EBTEngNotifyConnectionEvents,       // 41
     EBTEngCancelEventNotifier,          // 42
     EBTEngPrepareDiscovery,             // 43
-    EBTEngSetPairingObserver,           // 44
-    EBTEngPairDevice,                   // 45
-    EBTEngCancelPairDevice,             // 46
     };
 
 /**  TBTDevAddr class size */

--- a/bluetoothengine/bteng/inc/btengincpair.h	Mon May 03 12:40:50 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	Mon May 03 12:40:50 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	Mon May 03 12:40:50 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	Mon May 03 12:40:50 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_*/