--- a/usbengines/usbwatcher/src/cusbactivepersonalityhandler.cpp Tue Jul 06 15:24:15 2010 +0300
+++ b/usbengines/usbwatcher/src/cusbactivepersonalityhandler.cpp Wed Aug 18 10:48:20 2010 +0300
@@ -186,19 +186,17 @@
// ----------------------------------------------------------------------------
//
void CUsbActivePersonalityHandler::StartPersonality( TInt& aPersonalityId,
- TInt aAskOnConnectionSetting, TRequestStatus& aStatus )
+ TRequestStatus& aStatus )
{
LOG_FUNC
- LOG2( "PersonalityId = %d, AskOnConnectionSetting = %d", aPersonalityId,
- aAskOnConnectionSetting );
+ LOG1( "PersonalityId = %d ", aPersonalityId);
// Remove all notes.
iPersonalityNotifier->CancelAll();
iPersonalityId = &aPersonalityId;
- iAskOnConnectionSetting = aAskOnConnectionSetting;
aStatus = KRequestPending;
iRequestStatus = &aStatus;
@@ -272,7 +270,8 @@
{
case EUsbDeviceStateConfigured:
{
- if( aStateOld != EUsbDeviceStateSuspended )
+ if ((aStateOld != EUsbDeviceStateSuspended) && (ESwStateCharging
+ != CUsbGlobalSystemStateObserver::GlobalSystemState()))
{
iPersonalityParams->PersonalityNotifier().ShowQuery(
KCableConnectedNotifierUid, iDummy,
@@ -317,9 +316,13 @@
iQueryParams, iDummyBuf);
break;
case KErrDiskFull:
- iQueryParams().iQuery = EUSBDiskFull;
- iPersonalityParams->PersonalityNotifier().ShowQuery(KQueriesNotifier,
- iQueryParams, iDummyBuf);
+ if (ESwStateCharging
+ != CUsbGlobalSystemStateObserver::GlobalSystemState())
+ {
+ iQueryParams().iQuery = EUSBDiskFull;
+ iPersonalityParams->PersonalityNotifier().ShowQuery(
+ KQueriesNotifier, iQueryParams, iDummyBuf);
+ }
break;
default:
LOG( "Ignored" );
@@ -435,7 +438,6 @@
delete iCurrentPersonalityHandler;
iCurrentPersonalityHandler = NULL;
- //iAskOnConnectionSetting may be have been set to off
if ( iDeviceState == EUsbDeviceStateUndefined )
{
iPersonalityParams->PersonalityNotifier().CancelQuery(