# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701729 -10800 # Node ID ad9d655827efceef80f56011ed9435f89edef749 # Parent 842c592edba723dd59ed69087ea323c48ae68e10 Revision: 201035 Kit: 201037 diff -r 842c592edba7 -r ad9d655827ef package_definition.xml --- a/package_definition.xml Thu Sep 02 21:31:49 2010 +0300 +++ b/package_definition.xml Fri Sep 17 08:35:29 2010 +0300 @@ -1,52 +1,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 842c592edba7 -r ad9d655827ef package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Fri Sep 17 08:35:29 2010 +0300 @@ -0,0 +1,1 @@ + diff -r 842c592edba7 -r ad9d655827ef usbengines/usbwatcher/src/cusbwatcher.cpp --- a/usbengines/usbwatcher/src/cusbwatcher.cpp Thu Sep 02 21:31:49 2010 +0300 +++ b/usbengines/usbwatcher/src/cusbwatcher.cpp Fri Sep 17 08:35:29 2010 +0300 @@ -789,8 +789,10 @@ } else { - LOG( "Tryign to call CUsbWatcher::Start in non-idle state " ); - PANIC( KErrGeneral ); + //Start may have been called because device lock was unlocking. The + //personality may be already starting, so nothing needs to be done. + LOG1( "Trying to call CUsbWatcher::Start in non-idle state %d", + iState ); } }