MCL/sf/mw/btservices: comparison bluetoothengine/bteng/src/btengsrvsettingsmgr.cpp

equal deleted inserted replaced

-:613943a21004
+:9386f31cc85b
 #include <bt_subscribe_partner.h>
 #include <btnotif.h>
 #include <btengdomainpskeys.h>
 #include <centralrepository.h>
 #include <featmgr.h>
+#include <AknSmallIndicator.h>
+#include <avkon.hrh>
 #include "btengserver.h"
 #include "btengsrvpluginmgr.h"
 #include "btengsrvbbconnectionmgr.h"
 #include "btengsrvstate.h"
 #include "debug.h"
-#include <btindicatorconstants.h>
-#include <hbindicatorsymbian.h>
-#include <hbsymbianvariant.h>
 /** ID of active object helper */
 const TInt KBTEngSettingsActive = 30;
 /** Constant for converting minutes to microseconds */
 //const TInt64 KMinutesInMicroSecs = 60000000;
 // ---------------------------------------------------------------------------
 // C++ default constructor
 // ---------------------------------------------------------------------------
 //
 CBTEngSrvSettingsMgr::CBTEngSrvSettingsMgr( CBTEngServer* aServer )
-:   iServer( aServer ),iIndicatorState(-1)
+:   iServer( aServer )
 {
 }
 // ---------------------------------------------------------------------------
 //
 void CBTEngSrvSettingsMgr::ConstructL()
 {
 TRACE_FUNC_ENTRY
 iActive = CBTEngActive::NewL( *this, KBTEngSettingsActive );
-iBTIndicator = CHbIndicatorSymbian::NewL();
 LoadBTPowerManagerL();
 iEnterpriseEnablementMode = BluetoothFeatures::EnterpriseEnablementL();
 TRACE_INFO( ( _L( "iEnterpriseEnablementMode = %d" ), iEnterpriseEnablementMode) )
 if ( iEnterpriseEnablementMode == BluetoothFeatures::EDisabled )
 {
 // Destructor
 // ---------------------------------------------------------------------------
 //
 CBTEngSrvSettingsMgr::~CBTEngSrvSettingsMgr()
 {
+if( iActive && iActive->IsActive() )
+{
+// Cancel the outstanding request.
+iPowerMgr.Cancel();
+}
 delete iActive;
-delete iBTIndicator;
 iPowerMgr.Close();
 }
 // ---------------------------------------------------------------------------
 // We don't return an error here, as there is no error situation.
 TRACE_INFO( ( _L( "SetPowerStateL: nothing to do" ) ) )
 if ( currentState == aState )
 {
 // Make sure that the CenRep key is in sync.
-// During boot-up, the power is set from the CenRep key, so we could
+// During boot-up, the pwoer is set from the CenRep key, so we could
 // end up out-of-sync.
 TRACE_INFO( ( _L( "SetPowerStateL: currentState == aState" ) ) )
-HandleHwPowerChangeL( aState );
+UpdateCenRepPowerKeyL( aState );
 }
 return;
 }
 if ( aState == EBTOn )
 {
 // Hardware power on is the first step.
 TRACE_FUNC_EXIT
 }
 // ---------------------------------------------------------------------------
-// Update the power state CenRep key, and start BTNotif server if BT is on.
+// Update the power state CenRep key.
 // ---------------------------------------------------------------------------
 //
-void CBTEngSrvSettingsMgr::HandleHwPowerChangeL( TBTPowerState aState )
+void CBTEngSrvSettingsMgr::UpdateCenRepPowerKeyL( TBTPowerState aState )
 {
 TRACE_FUNC_ENTRY
 CRepository* cenrep = CRepository::NewLC( KCRUidBluetoothPowerState );
 // TBTPowerState power state type is inverted from TBTPowerStateValue...
-TBTPowerStateValue power = ( aState == EBTOn ) ? EBTPowerOn : EBTPowerOff;
+TBTPowerStateValue power = (TBTPowerStateValue) !aState;
 User::LeaveIfError( cenrep->Set( KBTPowerState, (TInt) power ) );
 CleanupStack::PopAndDestroy( cenrep );
 TRACE_FUNC_EXIT
 }
 // ---------------------------------------------------------------------------
 // ?implementation_description
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 // From class MBTEngActiveObserver.
 // Callback to notify that an outstanding request has completed.
 // ---------------------------------------------------------------------------
 //
-void CBTEngSrvSettingsMgr::RequestCompletedL( CBTEngActive* aActive, TInt aStatus )
+void CBTEngSrvSettingsMgr::RequestCompletedL( CBTEngActive* aActive, TInt aId, TInt aStatus )
 {
-__ASSERT_ALWAYS( aActive->RequestId() == KBTEngSettingsActive, PanicServer( EBTEngPanicCorrupt ) );
+__ASSERT_ALWAYS( aId == KBTEngSettingsActive, PanicServer( EBTEngPanicCorrupt ) );
 TRACE_FUNC_ENTRY
 (void) aActive;
 if ( aStatus != KErrNone && aStatus != KErrAlreadyExists && aStatus != KErrCancel )
 {
 // Something went wrong, so we turn BT off again.
 SetPowerStateL( EBTOff, EFalse );
 }
 if ( !iMessage.IsNull())
 {
 iMessage.Complete( aStatus );
 }
 TRACE_FUNC_EXIT
 }
-// ---------------------------------------------------------------------------
-// From class MBTEngActiveObserver.
-// Handles cancelation of an outstanding request
-// ---------------------------------------------------------------------------
-//
-void CBTEngSrvSettingsMgr::CancelRequest( TInt aRequestId )
-{
-TRACE_FUNC_ARG( ( _L( "reqID %d" ), aRequestId ) );
-if ( aRequestId == KBTEngSettingsActive )
-{
-iPowerMgr.Cancel();
-}
-TRACE_FUNC_EXIT
-}
 // ---------------------------------------------------------------------------
 // From class MBTEngActiveObserver.
 // Callback to notify that an error has occurred in RunL.
 // ---------------------------------------------------------------------------
 //
-void CBTEngSrvSettingsMgr::HandleError( CBTEngActive* aActive, TInt aError )
+void CBTEngSrvSettingsMgr::HandleError( CBTEngActive* aActive, TInt aId, TInt aError )
 {
 (void) aActive;
+(void) aId;
 if ( !iMessage.IsNull())
 {
 iMessage.Complete( aError );
 }
 }
 {
 TRACE_FUNC_ENTRY
 TRACE_INFO( ( _L( "[CBTEngSrvSettingsMgr]\t Using HCI API v2 power manager" ) ) )
 User::LeaveIfError( iPowerMgr.Open() );
 #ifndef __WINS__
 TRequestStatus reqStatus;
 iPowerMgr.SetPower( EBTOff, NULL, reqStatus );
 User::WaitForRequest( reqStatus );
 TInt status = ( reqStatus.Int() == KErrAlreadyExists ? KErrNone : reqStatus.Int() );
 User::LeaveIfError( status );
 TRACE_FUNC_ENTRY
 TBTPowerStateValue powerState = EBTPowerOff;
 TBTVisibilityMode visibilityMode = EBTVisibilityModeHidden;
 CRepository* cenrep = NULL;
 TInt phys = 0;
-//   TInt connecting = 0;
+TInt connecting = 0;
 cenrep = CRepository::NewLC( KCRUidBluetoothPowerState );
 User::LeaveIfError( cenrep->Get( KBTPowerState, (TInt&) powerState ) );
 CleanupStack::PopAndDestroy( cenrep );
 if( powerState == EBTPowerOff )
 {
-SetIndicatorStateL(EBTIndicatorOff);
+SetIndicatorStateL( EAknIndicatorBluetoothModuleOn, EAknIndicatorStateOff );
+SetIndicatorStateL( EAknIndicatorBluetooth, EAknIndicatorStateOff );
+SetIndicatorStateL( EAknIndicatorBluetoothModuleOnVisible, EAknIndicatorStateOff );
+SetIndicatorStateL( EAknIndicatorBluetoothVisible, EAknIndicatorStateOff );
 }
 else
 {
 // Power is on.
 RProperty::Get( KPropertyUidBluetoothCategory, KPropertyKeyBluetoothPHYCount, phys );
-//       RProperty::Get( KPropertyUidBluetoothCategory, KPropertyKeyBluetoothConnecting, connecting );
+RProperty::Get( KPropertyUidBluetoothCategory, KPropertyKeyBluetoothConnecting, connecting );
 cenrep = CRepository::NewLC( KCRUidBTEngPrivateSettings );
 User::LeaveIfError( cenrep->Get( KBTDiscoverable, (TInt&) visibilityMode ) );
 CleanupStack::PopAndDestroy( cenrep );
 if( visibilityMode == EBTVisibilityModeHidden )
 {
-if ( phys > 0 ) // BT connection active and hidden
+if ( connecting ) // BT connecting and hidden
 {
-SetIndicatorStateL(EBTIndicatorHiddenConnected);
+SetIndicatorStateL( EAknIndicatorBluetoothModuleOn, EAknIndicatorStateOff );
+SetIndicatorStateL( EAknIndicatorBluetooth, EAknIndicatorStateAnimate );
+}
+else if ( phys > 0 ) // BT connection active and hidden
+{
+SetIndicatorStateL( EAknIndicatorBluetoothModuleOn, EAknIndicatorStateOff );
+SetIndicatorStateL( EAknIndicatorBluetooth, EAknIndicatorStateOn );
 }
 else  // BT connection not active and hidden
 {
-SetIndicatorStateL(EBTIndicatorOnHidden);
+SetIndicatorStateL( EAknIndicatorBluetoothModuleOn, EAknIndicatorStateOn );
-}
+SetIndicatorStateL( EAknIndicatorBluetooth, EAknIndicatorStateOff );
+}
+SetIndicatorStateL( EAknIndicatorBluetoothModuleOnVisible, EAknIndicatorStateOff );
+SetIndicatorStateL( EAknIndicatorBluetoothVisible, EAknIndicatorStateOff );
 }
 else if( visibilityMode == EBTVisibilityModeGeneral || visibilityMode == EBTVisibilityModeTemporary )
 {
-if ( phys > 0 ) // BT connection active and visible
+if ( connecting ) // BT connecting and visible
 {
-SetIndicatorStateL(EBTIndicatorVisibleConnected);
+SetIndicatorStateL( EAknIndicatorBluetoothModuleOnVisible, EAknIndicatorStateOff );
+SetIndicatorStateL( EAknIndicatorBluetoothVisible, EAknIndicatorStateAnimate );
+}
+else if ( phys > 0 ) // BT connection active and visible
+{
+SetIndicatorStateL( EAknIndicatorBluetoothModuleOnVisible, EAknIndicatorStateOff );
+SetIndicatorStateL( EAknIndicatorBluetoothVisible, EAknIndicatorStateOn );
 }
 else  // BT connection not active and visible
 {
-SetIndicatorStateL(EBTIndicatorOnVisible);
+SetIndicatorStateL( EAknIndicatorBluetoothModuleOnVisible, EAknIndicatorStateOn );
-}
+SetIndicatorStateL( EAknIndicatorBluetoothVisible, EAknIndicatorStateOff );
 }
-}
+SetIndicatorStateL( EAknIndicatorBluetoothModuleOn, EAknIndicatorStateOff );
-TRACE_FUNC_EXIT
+SetIndicatorStateL( EAknIndicatorBluetooth, EAknIndicatorStateOff );
 }
+}
-void CBTEngSrvSettingsMgr::SetIndicatorStateL( const TInt aState )
+TRACE_FUNC_EXIT
-{
+}
-TBool success = EFalse;
-if(iIndicatorState != aState)
-{
+// ---------------------------------------------------------------------------
-CHbSymbianVariant* parameters = CHbSymbianVariant::NewL(&aState,CHbSymbianVariant::EInt );
+// ?implementation_description
-success = iBTIndicator->Activate(KIndicatorType(),parameters);
+// ---------------------------------------------------------------------------
-delete parameters;
+//
-if(!success)
+void CBTEngSrvSettingsMgr::SetIndicatorStateL( const TInt aIndicator, const TInt aState )
 {
-User::Leave(iBTIndicator->Error());
+CAknSmallIndicator* indicator = CAknSmallIndicator::NewLC( TUid::Uid( aIndicator ) );
-}
+indicator->SetIndicatorStateL( aState );
-iIndicatorState = aState;
+CleanupStack::PopAndDestroy( indicator ); //indicator
-}
 }
 // ---------------------------------------------------------------------------
 // Gets the current HW power state.
 {
 iAutoOffClients = 0;
 }
 TRACE_FUNC_EXIT
 }

branch	RCL_3
changeset 23	9386f31cc85b
parent 22	613943a21004