usbengines/usbwatcher/src/cusbactivepersonalityhandler.cpp
changeset 71 173beb545395
parent 52 831068540b07
child 74 830546d5951a
equal deleted inserted replaced
62:eadeea68c837 71:173beb545395
   184 // ----------------------------------------------------------------------------
   184 // ----------------------------------------------------------------------------
   185 // Start personality.
   185 // Start personality.
   186 // ----------------------------------------------------------------------------
   186 // ----------------------------------------------------------------------------
   187 //
   187 //
   188 void CUsbActivePersonalityHandler::StartPersonality( TInt& aPersonalityId,
   188 void CUsbActivePersonalityHandler::StartPersonality( TInt& aPersonalityId,
   189         TInt aAskOnConnectionSetting, TRequestStatus& aStatus )
   189         TRequestStatus& aStatus )
   190     {
   190     {
   191     LOG_FUNC
   191     LOG_FUNC
   192 
   192 
   193     LOG2( "PersonalityId = %d, AskOnConnectionSetting = %d", aPersonalityId,
   193     LOG1( "PersonalityId = %d ", aPersonalityId);
   194             aAskOnConnectionSetting );
       
   195 
   194 
   196     // Remove all notes.
   195     // Remove all notes.
   197     iPersonalityNotifier->CancelAll();
   196     iPersonalityNotifier->CancelAll();
   198      
   197      
   199 
   198 
   200     iPersonalityId = &aPersonalityId;
   199     iPersonalityId = &aPersonalityId;
   201     iAskOnConnectionSetting = aAskOnConnectionSetting;
       
   202     aStatus = KRequestPending;
   200     aStatus = KRequestPending;
   203     iRequestStatus = &aStatus;
   201     iRequestStatus = &aStatus;
   204 
   202 
   205     // prepare current personality for start and return
   203     // prepare current personality for start and return
   206     if( iCurrentPersonalityHandler )
   204     if( iCurrentPersonalityHandler )
   433             LOG( "EUsbPersonalityFinishStop" );
   431             LOG( "EUsbPersonalityFinishStop" );
   434 
   432 
   435             delete iCurrentPersonalityHandler;
   433             delete iCurrentPersonalityHandler;
   436             iCurrentPersonalityHandler = NULL;
   434             iCurrentPersonalityHandler = NULL;
   437 
   435 
   438             //iAskOnConnectionSetting may be have been set to off
       
   439             if ( iDeviceState == EUsbDeviceStateUndefined )
   436             if ( iDeviceState == EUsbDeviceStateUndefined )
   440                 {
   437                 {
   441 	            iPersonalityParams->PersonalityNotifier().CancelQuery(
   438 	            iPersonalityParams->PersonalityNotifier().CancelQuery(
   442 	                    KCableConnectedNotifierUid );
   439 	                    KCableConnectedNotifierUid );
   443                 }
   440                 }