diff -r f6533aee8b2b -r d895b6d953c9 usbuis/usbuinotif/src/usbnotifier.cpp --- a/usbuis/usbuinotif/src/usbnotifier.cpp Tue Apr 27 17:41:29 2010 +0300 +++ b/usbuis/usbuinotif/src/usbnotifier.cpp Tue May 25 13:47:46 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -99,9 +99,8 @@ // Activate apps -key again (if not previously activated yet) SuppressAppSwitching( EFalse ); - // Restore the keylock if not restored before (caused by Leave). - // If the Keylock is restored already, the function does nothing. - RestoreKeylock(); + //Don't call RestoreKeylock here. It's up to specific note notfier logic. + //If failed to RestoreKeylock there, it doesn't matter to leave keylock open. FLOG(_L("[USBUINOTIF]\t CUSBUINotifierBase::Destructor completed")); }