diff -r f7fbeaeb166a -r b23265fb36da bluetoothengine/bteng/src/btengsrvkeywatcher.cpp --- a/bluetoothengine/bteng/src/btengsrvkeywatcher.cpp Wed Apr 14 16:09:00 2010 +0300 +++ b/bluetoothengine/bteng/src/btengsrvkeywatcher.cpp Tue Apr 27 16:49:44 2010 +0300 @@ -39,8 +39,6 @@ /** Identification for active object */ const TInt KBTEngSysWatcher = 17; /** Identification for active object */ -const TInt KBTEngPHYCountWatcher = 18; -/** Identification for active object */ const TInt KBTEngBtConnectionWatcher = 19; /** Identification for active object */ const TInt KBTEngScanningWatcher = 20; @@ -103,16 +101,7 @@ CActive::EPriorityStandard ); iSystemStateKey.Subscribe( iSystemStateWatcher->RequestStatus() ); iSystemStateWatcher->GoActive(); - } - - err = iPHYCountKey.Attach( KPropertyUidBluetoothCategory, KPropertyKeyBluetoothPHYCount ); - if( !err ) - { - iPHYCountWatcher = CBTEngActive::NewL( *this, KBTEngPHYCountWatcher, - CActive::EPriorityStandard ); - iPHYCountKey.Subscribe( iPHYCountWatcher->RequestStatus() ); - iPHYCountWatcher->GoActive(); - } + } err = iBtConnectionKey.Attach( KPropertyUidBluetoothCategory, KPropertyKeyBluetoothConnecting ); if( !err ) @@ -224,14 +213,7 @@ iSystemStateKey.Cancel(); } delete iSystemStateWatcher; - iSystemStateKey.Close(); - - if( iPHYCountKey.Handle() ) - { - iPHYCountKey.Cancel(); - } - delete iPHYCountWatcher; - iPHYCountKey.Close(); + iSystemStateKey.Close(); if( iBtConnectionKey.Handle() ) { @@ -332,17 +314,9 @@ val == ESwStateShuttingDown ) { iServer->SettingsManager()->SetVisibilityModeL( EBTVisibilityModeNoScans , 0 ); - iServer->DisconnectAllL(); + iServer->DisconnectAllForPowerOffL(); } } - break; - case KBTEngPHYCountWatcher: - { - TRACE_INFO( ( _L( "PHY count key changed" ) ) ) - iPHYCountKey.Subscribe( aActive->RequestStatus() ); - aActive->GoActive(); - iServer->SettingsManager()->SetUiIndicatorsL(); - } break; case KBTEngBtConnectionWatcher: {