--- a/gba/data/gba_license.txt	Tue May 11 17:00:25 2010 +0300
+++ b/gba/data/gba_license.txt	Tue May 25 13:36:52 2010 +0300
@@ -1,8 +1,2 @@
-End-User License Agreement: 
-By installing or using this software you are confirming acceptance of this software and agree to be bound by the terms and conditions of this Licence.
-
-Grant of License: 
-Nokia grants you a non-exclusive, non-transferable limited end-user right to use this software for the sole purpose of developing and testing applications or middleware software for the Symbian Platform.
-
 Disclaimer of Warranty: 
-THIS SOFTWARE IS PROVIDED TO YOU "AS IS"AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NOKIA, ITS MEMBERS, SUPPLIERS AND LICENSORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATE, OR PROFITS; OR INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED TO YOU "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NOKIA, ITS MEMBERS, SUPPLIERS AND LICENSORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, OR EXEMPLARY DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATE, OR PROFITS; OR INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--- a/gba/sis/gba.pkg	Tue May 11 17:00:25 2010 +0300
+++ b/gba/sis/gba.pkg	Tue May 25 13:36:52 2010 +0300
@@ -17,7 +17,7 @@
 &EN
 
 ; Header
-#{"GBA (Beta)"},(0x20029F08), 0, 5, 0, TYPE=SA,RU
+#{"GBA"},(0x20029F08), 1, 0, 0, TYPE=SA,RU
 
 ; Localised Vendor name
 %{"Nokia"}

--- a/securitydialogs/Autolock/src/AutolockAppUi.cpp	Tue May 11 17:00:25 2010 +0300
+++ b/securitydialogs/Autolock/src/AutolockAppUi.cpp	Tue May 25 13:36:52 2010 +0300
@@ -767,14 +767,6 @@
             TRAPD(err,
 			{
 			iDeviceLockQueryStatus = ETrue;
-			TBool iAppKeyBelongedToBigClock=EFalse;
-			if(!iAppKey)
-				{
-				// RDebug::Printf( "%s %s (%u) stealing EStdKeyApplication0 from BigClock=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
-				RWindowGroup& groupWin=iCoeEnv->RootWin();
-				iAppKey = groupWin.CaptureKeyUpAndDowns(EStdKeyApplication0, 0, 0); // Capture app key now, in case that it was given to BigClock
-				iAppKeyBelongedToBigClock=ETrue;
-				}
 			if(handler->AskSecCodeInAutoLockL())
 				{		
 				iLocked = EFalse;
@@ -786,13 +778,6 @@
 				}
             else
 				{  // make sure that we will be topmost still
-					if(iAppKey && iAppKeyBelongedToBigClock)
-						{
-						// RDebug::Printf( "%s %s (%u) giving EStdKeyApplication0 to BigClock=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
-						RWindowGroup& groupWin=iCoeEnv->RootWin();
-						groupWin.CancelCaptureKeyUpAndDowns(iAppKey);	// give S60-Application key back to BigClock
-						iAppKey = 0;
-						}
 				    iDeviceLockQueryStatus = EFalse;
                     TInt callState;
                     RProperty::Get( KPSUidCtsyCallInformation, KCTsyCallState, callState );
@@ -1003,25 +988,7 @@
 	if (!iAppKey)
 		{
 		RWindowGroup& groupWin=iCoeEnv->RootWin();
-		#if defined(_DEBUG)
-		RDebug::Printf( "%s %s (%u) searching for popupclock.exe =%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0x0 );
-		#endif
-		TApaTaskList taskList( CCoeEnv::Static()->WsSession() );
-		const TUid KBigClockUid = { 0x2000FDC3 };
-		TApaTask task( taskList.FindApp( KBigClockUid ) );
-		if ( task.Exists() )
-			{
-			#if defined(_DEBUG)
-			RDebug::Printf( "%s %s (%u) popupclock.exe is running. Not capturing EStdKeyApplication0=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, EStdKeyApplication0 );
-			#endif
-			}
-		else
-			{
-			#if defined(_DEBUG)
-			RDebug::Printf( "%s %s (%u) popupclock.exe not running. Not capturing EStdKeyApplication0=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, EStdKeyApplication0 );
-			#endif
-			iAppKey = groupWin.CaptureKeyUpAndDowns(EStdKeyApplication0, 0, 0); // Capture app key
-			}
+		iAppKey = groupWin.CaptureKeyUpAndDowns(EStdKeyApplication0, 0, 0); // Capture app key
 		}
 	LockSideKeyL();
 	}

--- a/securitydialogs/SecUi/Src/SecUiManualSecuritySettings.cpp	Tue May 11 17:00:25 2010 +0300
+++ b/securitydialogs/SecUi/Src/SecUiManualSecuritySettings.cpp	Tue May 25 13:36:52 2010 +0300
@@ -399,8 +399,6 @@
     RDebug::Print(_L("(SECUI)CManualSecuritySettings::LockSimL(): Param length: %d"), length);
     #endif
 
-    if(aLockCode.Length() <= KSimLockMaxPasswordSize)
-    {
     if (aType.CompareF(Operator) == 0)
         {
         aLockType = RMmCustomAPI::EOperator;
@@ -436,7 +434,6 @@
         aLockType = RMmCustomAPI::EOperator_Gid2;
         ret = iCustomPhone.ActivateSimLock( aLockCode,aLockType );
         }
-    }
 
     #if defined(_DEBUG)
     RDebug::Print(_L("(SECUI)CManualSecuritySettings::LockSimL() RESULT: %d"), ret);
@@ -503,8 +500,7 @@
     #if defined(_DEBUG)
     RDebug::Print(_L("(SECUI)CManualSecuritySettings::UnLockSimL(): Param length: %d"), length);
     #endif
-    if(aUnlockCode.Length() <= KSimLockMaxPasswordSize)
-    {
+    
     if (aType.CompareF(Operator) == 0)
         {
         aLockType = RMmCustomAPI::EOperator;
@@ -546,7 +542,6 @@
         ret = iCustomPhone.DeActivateSimLock( aUnlockCode,aLockType );
         }    
         
-    }
     #if defined(_DEBUG)
     RDebug::Print(_L("(SECUI)CManualSecuritySettings::UnLockSimL() RESULT: %d"), ret);
     #endif

--- a/securitydialogs/lockapp/src/lockappappui.cpp	Tue May 11 17:00:25 2010 +0300
+++ b/securitydialogs/lockapp/src/lockappappui.cpp	Tue May 25 13:36:52 2010 +0300
@@ -34,7 +34,7 @@
 void CLockAppAppUi::ConstructL( )
     {
     	#if defined(_DEBUG)
-    	RDebug::Printf( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0x8 );
+    	INFO_4( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0x8 );
     	#endif
     	    
    // default appui constructor has to be called
@@ -45,7 +45,7 @@
     	{
 			// start autolock instead of lockapp . This is a backup solution to use in case that not all SysAp and Avkon changes are implemented
 			#if defined(_DEBUG)
-	 	  RDebug::Printf( "%s %s (%u) 1=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0x1 );
+	 	  INFO_4( "%s %s (%u) 1=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0x1 );
  	  	#endif
 	    TApaTaskList taskList( iCoeEnv->WsSession() );
 	    TApaTask task( taskList.FindApp( _L("autolock.exe" )) );
@@ -62,7 +62,7 @@
 		    // Try to launch the application.        
 	        User::LeaveIfError(ls.StartApp(*commandLine));
 	        #if defined(_DEBUG)
-	    	  RDebug::Printf( "%s %s (%u) autolock.exe created=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0x7 );
+	    	  INFO_4( "%s %s (%u) autolock.exe created=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0x7 );
 	    	  #endif
 	        
 	        CleanupStack::PopAndDestroy(2); // commandLine, ls
@@ -189,12 +189,12 @@
 void CLockAppAppUi::HandleWsEventL( const TWsEvent& aEvent, CCoeControl* aDestination )
     {
     #if defined(_DEBUG)
-		RDebug::Printf( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+		INFO_4( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
 		#endif
     if ( aEvent.Type() == TRawEvent::EKeyDown )
         {
         #if defined(_DEBUG)
-        RDebug::Printf("CLockAppAppUi::HandleWsEventL() - aEvent.Key()->iCode: %d", aEvent.Key()->iCode );
+        INFO_1("CLockAppAppUi::HandleWsEventL() - aEvent.Key()->iCode: %d", aEvent.Key()->iCode );
         #endif
         }
 

--- a/securitydialogs/lockapp/src/lockappbasecontrol.cpp	Tue May 11 17:00:25 2010 +0300
+++ b/securitydialogs/lockapp/src/lockappbasecontrol.cpp	Tue May 25 13:36:52 2010 +0300
@@ -32,7 +32,7 @@
 CLockAppBaseControl::CLockAppBaseControl( MLockAppStateControl& aStateControl ) :
     iStateControl(aStateControl), iWindowGroup( iEikonEnv->RootWin())
     {
-	RDebug::Printf( "%s %s (%u) 1=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
+	INFO_4( "%s %s (%u) 1=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
     }
 
 // ---------------------------------------------------------------------------
@@ -40,7 +40,7 @@
 // ---------------------------------------------------------------------------
 void CLockAppBaseControl::ConstructL( )
     {
-	RDebug::Printf( "%s %s (%u) 1=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
+	INFO_4( "%s %s (%u) 1=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
     iKeyPattern = CLockAppKeyPattern::NewL( );
     }
 
@@ -176,8 +176,8 @@
 // ---------------------------------------------------------------------------
 void CLockAppBaseControl::CapturePrimaryKeys( const TBool aCapture )
     {   
-    	RDebug::Printf( "%s %s (%u) aCapture=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aCapture );
-    	RDebug::Printf( "%s %s (%u) iKeyPattern=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, iKeyPattern );
+    	INFO_4( "%s %s (%u) aCapture=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aCapture );
+    	INFO_4( "%s %s (%u) iKeyPattern=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, iKeyPattern );
     if ( iKeyPattern )
         {
         if ( aCapture )

--- a/securitydialogs/lockapp/src/lockappcenrepobserver.cpp	Tue May 11 17:00:25 2010 +0300
+++ b/securitydialogs/lockapp/src/lockappcenrepobserver.cpp	Tue May 25 13:36:52 2010 +0300
@@ -68,7 +68,7 @@
 void CLockAppCenRepObserver::ConstructL( )
     {
     // init cenrep connection
-RDebug::Printf( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+INFO_4( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
     iRepository = CRepository::NewL( iCenRepUid );
     iNotifyHandler = CCenRepNotifyHandler::NewL( *this, *iRepository,
             CCenRepNotifyHandler::EIntKey, iKeyId );
@@ -88,7 +88,7 @@
 // ---------------------------------------------------------------------------
 TInt CLockAppCenRepObserver::GetKeyValue(TUint32 aKey, TInt& aValue )
     {
-    	    RDebug::Printf( "%s %s (%u) aKey=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aKey );
+    	    INFO_4( "%s %s (%u) aKey=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aKey );
 
     return iRepository->Get( aKey, aValue );
     }
@@ -114,7 +114,7 @@
 // ---------------------------------------------------------------------------
 void CLockAppCenRepObserver::HandleNotifyInt(TUint32 aKeyId, TInt aValue )
     {
-RDebug::Printf( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+INFO_4( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
     if ( aKeyId == iKeyId )
         {
         if ( iObserver )

--- a/securitydialogs/lockapp/src/lockappdevicelockcontrol.cpp	Tue May 11 17:00:25 2010 +0300
+++ b/securitydialogs/lockapp/src/lockappdevicelockcontrol.cpp	Tue May 25 13:36:52 2010 +0300
@@ -60,7 +60,7 @@
 CLockAppDevicelockControl* CLockAppDevicelockControl::NewL(MLockAppStateControl& aStateControl, RWindowGroup& aWg )
     {
     CLockAppDevicelockControl* self = new (ELeave) CLockAppDevicelockControl( aStateControl );
-    RDebug::Printf( "%s %s (%u) self=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, self );
+    INFO_4( "%s %s (%u) self=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, self );
 
     CleanupStack::PushL( self );
     self->ConstructL( aWg );
@@ -74,7 +74,7 @@
 CLockAppDevicelockControl::CLockAppDevicelockControl(MLockAppStateControl& aStateControl) :
     CLockAppBaseControl(aStateControl), iShowingSecCodeQuery(EFalse)
     {
-    	RDebug::Printf( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+    	INFO_4( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
 
     }
 
@@ -83,7 +83,7 @@
 // ---------------------------------------------------------------------------
 CLockAppDevicelockControl::~CLockAppDevicelockControl( )
     {
-    	RDebug::Printf( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+    	INFO_4( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
 
     /*****************************************************
     *    S60 Customer / ETel
@@ -93,31 +93,31 @@
     *    S60 Customer / TSY
     *    Needs customer TSY implementation
     *****************************************************/
-    RDebug::Printf( "%s %s (%u) iCustomPhoneInitialized=%x -> -1 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iCustomPhoneInitialized );
+    INFO_4( "%s %s (%u) iCustomPhoneInitialized=%x -> -1 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iCustomPhoneInitialized );
     iCustomPhoneInitialized=-1;
     if ( iCustomPhone.SubSessionHandle( ) )
         {
         iCustomPhone.Close( );
-        RDebug::Printf( "%s %s (%u) iCustomPhoneInitialized=%x -> -2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iCustomPhoneInitialized );
+        INFO_4( "%s %s (%u) iCustomPhoneInitialized=%x -> -2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iCustomPhoneInitialized );
         iCustomPhoneInitialized=-2;
         }
 
-		RDebug::Printf( "%s %s (%u) iPhoneInitialized=%x -> -1 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
+		INFO_4( "%s %s (%u) iPhoneInitialized=%x -> -1 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
 		iPhoneInitialized=-1;
     if ( iPhone.SubSessionHandle( ) )
         {
         iPhone.Close( );
-        RDebug::Printf( "%s %s (%u) iPhoneInitialized=%x -> -2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
+        INFO_4( "%s %s (%u) iPhoneInitialized=%x -> -2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
 				iPhoneInitialized=-2;
         }
 
-    RDebug::Printf( "%s %s (%u) iTelServerInitialized=%x -> -1 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
+    INFO_4( "%s %s (%u) iTelServerInitialized=%x -> -1 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
     iTelServerInitialized=-1;
     if ( iTelServer.Handle( ) )
         {
         iTelServer.UnloadPhoneModule( KMmTsyModuleName );
         iTelServer.Close( );
-        RDebug::Printf( "%s %s (%u) iTelServerInitialized=%x -> -2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
+        INFO_4( "%s %s (%u) iTelServerInitialized=%x -> -2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
         iTelServerInitialized=-2;
         }
     if ( iActivityManager )
@@ -214,7 +214,7 @@
         }
     ERROR(err, "CLockAppDevicelockControl::ConnectToPhoneL - connecting to etel server");
     User::LeaveIfError( err );
-    RDebug::Printf( "%s %s (%u) iTelServerInitialized=%x -> 2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
+    INFO_4( "%s %s (%u) iTelServerInitialized=%x -> 2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
     iTelServerInitialized=2;
 
 
@@ -235,7 +235,7 @@
         ERROR(err, "CLockAppDevicelockControl::ConnectToPhoneL - loading TSY");
         User::LeaveIfError( err );
         }
-    RDebug::Printf( "%s %s (%u) iTelServerInitialized=%x -> 3 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
+    INFO_4( "%s %s (%u) iTelServerInitialized=%x -> 3 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
     iTelServerInitialized=3;
 
     /*****************************************************
@@ -245,16 +245,16 @@
     INFO( "CLockAppDevicelockControl::ConnectToPhoneL - opening phone");
     RTelServer::TPhoneInfo PhoneInfo;
     User::LeaveIfError( iTelServer.SetExtendedErrorGranularity( RTelServer::EErrorExtended ) );
-    RDebug::Printf( "%s %s (%u) iTelServerInitialized=%x -> 5 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
+    INFO_4( "%s %s (%u) iTelServerInitialized=%x -> 5 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
     iTelServerInitialized=5;
     User::LeaveIfError( iTelServer.GetPhoneInfo( KPhoneIndex, PhoneInfo ) );
-    RDebug::Printf( "%s %s (%u) iTelServerInitialized=%x -> 6 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
+    INFO_4( "%s %s (%u) iTelServerInitialized=%x -> 6 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iTelServerInitialized );
     iTelServerInitialized=6;
     User::LeaveIfError( iPhone.Open( iTelServer, PhoneInfo.iName ) );
-		RDebug::Printf( "%s %s (%u) iPhoneInitialized=%x -> 2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
+		INFO_4( "%s %s (%u) iPhoneInitialized=%x -> 2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
 		iPhoneInitialized=2;
     User::LeaveIfError( iCustomPhone.Open( iPhone ) );
-		RDebug::Printf( "%s %s (%u) iCustomPhoneInitialized=%x -> 2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iCustomPhoneInitialized );
+		INFO_4( "%s %s (%u) iCustomPhoneInitialized=%x -> 2 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iCustomPhoneInitialized );
 		iCustomPhoneInitialized=2;
 
     INFO( "CLockAppDevicelockControl::ConnectToPhoneL - phone opened");
@@ -279,7 +279,7 @@
 
     TRequestStatus getLockInfoStatus;
     iPhone.GetLockInfo( getLockInfoStatus, lockType, lockInfoPkg );
-		RDebug::Printf( "%s %s (%u) iPhoneInitialized=%x -> 3 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
+		INFO_4( "%s %s (%u) iPhoneInitialized=%x -> 3 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
 		iPhoneInitialized=3;
     User::WaitForRequest( getLockInfoStatus );
 
@@ -392,7 +392,7 @@
     if ( systemLocked )
         {
         INFO( "CLockAppDevicelockControl::ConnectToPhoneL - Lock system");
-        RDebug::Printf( "%s %s (%u) 1=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
+        INFO_4( "%s %s (%u) 1=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
         iStateControl.EnableDevicelockL( EDevicelockManual );
         INFO( "CLockAppDevicelockControl::ConnectToPhoneL - Lock system. Done");
         }
@@ -458,7 +458,7 @@
 // ----------------------------------------------------------
 TBool CLockAppDevicelockControl::IsHiddenReset( )
     {
-    	    	RDebug::Printf( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+    	    	INFO_4( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
 
     TBool ret( EFalse );
     TInt startupReason( ENormalStartup );
@@ -476,7 +476,7 @@
 			err=file.Open(fs, KTestHiddenReset, EFileStreamText|EFileRead|EFileShareReadersOnly);
 			if(err==KErrNone)
 				{
-				RDebug::Printf( "%s %s (%u) ??? TestHiddenReset=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
+				INFO_4( "%s %s (%u) ??? TestHiddenReset=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
 				ret = ETrue;
 				}
 			file.Close();
@@ -561,12 +561,12 @@
     *****************************************************/
 
 
-		RDebug::Printf( "%s %s (%u) 111 value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+		INFO_4( "%s %s (%u) 111 value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
 
-    // RDebug::Printf( "%s %s (%u) iStateControl=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, iStateControl );
+    // INFO_4( "%s %s (%u) iStateControl=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, iStateControl );
 
-		RDebug::Printf( "%s %s (%u) checking iPhoneInitialized=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
-		RDebug::Printf( "%s %s (%u) iPhoneInitialized=%x -> 4 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
+		INFO_4( "%s %s (%u) checking iPhoneInitialized=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+		INFO_4( "%s %s (%u) iPhoneInitialized=%x -> 4 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
 		iPhoneInitialized=4;
 
     RMobilePhone::TMobilePhoneLock lockType = RMobilePhone::ELockPhoneDevice;
@@ -574,14 +574,14 @@
     RMobilePhone::TMobilePhoneLockInfoV1Pckg lockInfoPkg(lockInfo);
     RMobilePhone::TMobilePhoneLockSetting lockChange(RMobilePhone::ELockSetDisabled);
 
-		RDebug::Printf( "%s %s (%u) before getLockInfoStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+		INFO_4( "%s %s (%u) before getLockInfoStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
     TRequestStatus getLockInfoStatus;
-		RDebug::Printf( "%s %s (%u) after getLockInfoStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+		INFO_4( "%s %s (%u) after getLockInfoStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
 		
-		RDebug::Printf( "%s %s (%u) iPhoneInitialized=%x -> 5 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
+		INFO_4( "%s %s (%u) iPhoneInitialized=%x -> 5 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
 		iPhoneInitialized=5;
     iPhone.GetLockInfo( getLockInfoStatus, lockType, lockInfoPkg );
-		RDebug::Printf( "%s %s (%u) iPhoneInitialized=%x -> 6 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
+		INFO_4( "%s %s (%u) iPhoneInitialized=%x -> 6 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
 		iPhoneInitialized=6;
     User::WaitForRequest( getLockInfoStatus );
 
@@ -621,10 +621,10 @@
         RProperty::Set( KPSUidSecurityUIs, KSecurityUIsSecUIOriginatedQuery, ESecurityUIsSystemLockOriginated );
         TRequestStatus setLockSettingStatus;
         lockChange = RMobilePhone::ELockSetEnabled;
-				RDebug::Printf( "%s %s (%u) iPhoneInitialized=%x -> 8 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
+				INFO_4( "%s %s (%u) iPhoneInitialized=%x -> 8 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
 				iPhoneInitialized=8;
         iPhone.SetLockSetting( setLockSettingStatus, lockType, lockChange );
-				RDebug::Printf( "%s %s (%u) iPhoneInitialized=%x -> 9 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
+				INFO_4( "%s %s (%u) iPhoneInitialized=%x -> 9 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
 				iPhoneInitialized=9;
         User::WaitForRequest(setLockSettingStatus);
         INFO_1( "CLockAppDevicelockControl::ETelActivationAllowed - SetLockSetting status: %d ", setLockSettingStatus.Int() );
@@ -658,8 +658,8 @@
 	         };
 	     TInt tRet = RProperty::Get(KHFVuiModePSUid, EHFVuiPSModeId, vuiValue);  // also 0 if can't get because permissions or because doesn't exists
 	     #if defined(_DEBUG)
-	         RDebug::Printf( "%s %s (%u) getting KHFVuiModePSUid+EHFVuiPSModeId=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, tRet );
-	         RDebug::Printf( "%s %s (%u) vuiValue=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, vuiValue );
+	         INFO_4( "%s %s (%u) getting KHFVuiModePSUid+EHFVuiPSModeId=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, tRet );
+	         INFO_4( "%s %s (%u) vuiValue=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, vuiValue );
 	     #endif
 	     if(vuiValue)
 	         {
@@ -673,8 +673,8 @@
 	     TInt secQueryStatus = ESecurityQueryUninitialized;
 	     TInt tRet = RProperty::Get(KPSUidStartup, KStartupSecurityCodeQueryStatus, secQueryStatus);  // also 0 if can't get because permissions or because doesn't exists
 	     #if defined(_DEBUG)
-	         RDebug::Printf( "%s %s (%u) getting KPSUidStartup+KStartupSecurityCodeQueryStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, tRet );
-	         RDebug::Printf( "%s %s (%u) secQueryStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, secQueryStatus );
+	         INFO_4( "%s %s (%u) getting KPSUidStartup+KStartupSecurityCodeQueryStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, tRet );
+	         INFO_4( "%s %s (%u) secQueryStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, secQueryStatus );
 	     #endif
 	     if(secQueryStatus==ESecurityQueryActive)
 	         {
@@ -848,8 +848,8 @@
 // ---------------------------------------------------------------------------
 void CLockAppDevicelockControl::HandleEnvironmentChange( TUint aEnvMask, TUint aEventMask )
     {
-    RDebug::Printf( "%s %s (%u) aEnvMask=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aEnvMask );
-    RDebug::Printf( "%s %s (%u) aEventMask=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aEventMask );
+    INFO_4( "%s %s (%u) aEnvMask=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aEnvMask );
+    INFO_4( "%s %s (%u) aEventMask=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aEventMask );
 
     if ( IsBitFieldSet( aEventMask, KLockAppEnvScreenSaverOn ) )
         {
@@ -860,13 +860,13 @@
         {
         TInt lockValue=0;
     		iPSAutolockState->GetKeyValue( lockValue );
-    		RDebug::Printf( "%s %s (%u) lockValue=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, lockValue );
+    		INFO_4( "%s %s (%u) lockValue=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, lockValue );
     		if(lockValue>EAutolockOff)	// device is locked and query is not open
     			{
     			// indicate to TARM that it should not ask for password
     			TInt secUiOriginatedQuery(ESecurityUIsSecUIOriginatedUninitialized);
     			RProperty::Get(KPSUidSecurityUIs, KSecurityUIsSecUIOriginatedQuery, secUiOriginatedQuery);
-    			RDebug::Printf( "%s %s (%u) secUiOriginatedQuery=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, secUiOriginatedQuery );
+    			INFO_4( "%s %s (%u) secUiOriginatedQuery=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, secUiOriginatedQuery );
     			RProperty::Set( KPSUidSecurityUIs, KSecurityUIsSecUIOriginatedQuery, ESecurityUIsFpsOriginated );
 
         	HandleUnlockCommandL( );
@@ -877,24 +877,24 @@
         }
     if ( IsBitFieldSet( aEnvMask, KLockAppEnvGrip ) )
     	{
-      RDebug::Printf( "%s %s (%u) iShowingSecCodeQuery=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, iShowingSecCodeQuery );
+      INFO_4( "%s %s (%u) iShowingSecCodeQuery=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, iShowingSecCodeQuery );
 	    if ( IsBitFieldSet( aEventMask, KLockAppEnvGrip ) )	//Grip opened
 	        {
 	        if(iShowingSecCodeQuery==EFalse)
 	        	{
 	        		TInt lockValue=0;
 	        		iPSAutolockState->GetKeyValue( lockValue );
-	        		RDebug::Printf( "%s %s (%u) lockValue=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, lockValue );
+	        		INFO_4( "%s %s (%u) lockValue=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, lockValue );
 	        		if(lockValue>EAutolockOff)
 	        			{
 				        // ask unlock code by sending the menu key. This works on touch?
 			        	TApaTaskList tasklist( iEikonEnv->WsSession() );
 			        	#define KAknCapServerUid TUid::Uid( 0x10207218 )
 			        	TApaTask capserver = tasklist.FindApp( KAknCapServerUid );
-    						RDebug::Printf( "%s %s (%u) KAknCapServerUid=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, KAknCapServerUid );
+    						INFO_4( "%s %s (%u) KAknCapServerUid=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, KAknCapServerUid );
 			        	if( capserver.Exists() )
 			        	    {
-	        	        RDebug::Printf( "%s %s (%u) capserver.Exists() EStdKeyDevice0=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, EStdKeyDevice0 );
+	        	        INFO_4( "%s %s (%u) capserver.Exists() EStdKeyDevice0=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, EStdKeyDevice0 );
 			        	    TKeyEvent key;
 			        	    key.iCode = EKeyDevice0;
 			        	    key.iModifiers = 0;
@@ -912,7 +912,7 @@
             //the device lock query is on top
 	        	//generate cancel key event
 	        	const TInt KCancelKeyCode( 165 );
-	        	RDebug::Printf( "%s %s (%u) KCancelKeyCode=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, KCancelKeyCode );
+	        	INFO_4( "%s %s (%u) KCancelKeyCode=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, KCancelKeyCode );
 
 	        	TRawEvent rawEvent;
 	        	rawEvent.Set( TRawEvent::EKeyDown, KCancelKeyCode );
@@ -927,8 +927,8 @@
 // ---------------------------------------------------------------------------
 void CLockAppDevicelockControl::HandleCenRepNotify(TUid /*aCenRepUid*/, TUint32 aKeyId, TInt aValue )
     {
-    RDebug::Printf( "%s %s (%u) aKeyId=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aKeyId );
-    RDebug::Printf( "%s %s (%u) aValue=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aValue );
+    INFO_4( "%s %s (%u) aKeyId=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aKeyId );
+    INFO_4( "%s %s (%u) aValue=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aValue );
     switch ( aKeyId )
         {
         case KSettingsAutoLockTime:
@@ -947,9 +947,9 @@
 // ---------------------------------------------------------------------------
 void CLockAppDevicelockControl::HandlePubSubNotify(TUid aPubSubUid, TUint aKeyId, TInt aValue )
     {
-    RDebug::Printf( "%s %s (%u) KPSUidCoreApplicationUIs=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, KPSUidCoreApplicationUIs );
-    RDebug::Printf( "%s %s (%u) aKeyId=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aKeyId );
-    RDebug::Printf( "%s %s (%u) aValue=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aValue );
+    INFO_4( "%s %s (%u) KPSUidCoreApplicationUIs=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, KPSUidCoreApplicationUIs );
+    INFO_4( "%s %s (%u) aKeyId=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aKeyId );
+    INFO_4( "%s %s (%u) aValue=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aValue );
     if ( aPubSubUid == KPSUidCoreApplicationUIs )
         {
         switch ( aKeyId )
@@ -973,8 +973,8 @@
 // ---------------------------------------------------------------------------
 TKeyResponse CLockAppDevicelockControl::OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType )
     {
-    RDebug::Printf( "%s %s (%u) aKeyEvent.iCode=%x aType=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aKeyEvent.iCode, aType );
-    RDebug::Printf( "%s %s (%u) iActive=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, iActive );
+    INFO_4( "%s (%u) aKeyEvent.iCode=%x aType=%x", __FILE__, __LINE__, aKeyEvent.iCode, aType );
+    INFO_4( "%s %s (%u) iActive=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, iActive );
     if ( iActive )
         {
     		if(AknLayoutUtils::PenEnabled())
@@ -1010,18 +1010,18 @@
     INFO( "CLockAppDevicelockControl::HandleUnlockCommandL" );
     // inform sysap to put lights on left soft key press
     SendMessageToSysAp( EEikKeyLockLightsOnRequest );
-		RDebug::Printf( "%s %s (%u) iPhoneInitialized=%x -> 10 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
+		INFO_4( "%s %s (%u) iPhoneInitialized=%x -> 10 ", __FILE__, __PRETTY_FUNCTION__, __LINE__, iPhoneInitialized );
 		iPhoneInitialized=10;
     CSecurityHandler* handler = new (ELeave) CSecurityHandler( iPhone );
-		RDebug::Printf( "%s %s (%u) got handler=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
+		INFO_4( "%s %s (%u) got handler=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
     CleanupStack::PushL( handler );
     TSecUi::InitializeLibL( );
-		RDebug::Printf( "%s %s (%u) got TSecUi::InitializeLibL=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
+		INFO_4( "%s %s (%u) got TSecUi::InitializeLibL=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
     iShowingSecCodeQuery = ETrue;
     TRAPD(err, {
-								RDebug::Printf( "%s %s (%u) before AskSecCodeInAutoLockL=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
+								INFO_4( "%s %s (%u) before AskSecCodeInAutoLockL=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
                 TBool ret = handler->AskSecCodeInAutoLockL();
-								RDebug::Printf( "%s %s (%u) after AskSecCodeInAutoLockL=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, ret );
+								INFO_4( "%s %s (%u) after AskSecCodeInAutoLockL=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, ret );
                 INFO_1( "CLockAppDevicelockControl::HandleUnlockCommandL - AskSecCodeInAutoLockL = %d", ret );
                 if ( ret )
                     {

--- a/securitydialogs/lockapp/src/lockappkeyguardcontrol.cpp	Tue May 11 17:00:25 2010 +0300
+++ b/securitydialogs/lockapp/src/lockappkeyguardcontrol.cpp	Tue May 25 13:36:52 2010 +0300
@@ -526,8 +526,10 @@
 // ---------------------------------------------------------------------------
 TKeyResponse CLockAppKeyguardControl::OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType )
     {
-    RDebug::Printf( "%s %s (%u) aKeyEvent.iCode=%x aType=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, aKeyEvent.iCode, aType );
-    RDebug::Printf( "%s %s (%u) iActive=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, iActive );
+    
+    INFO_4( "%s %s (%u) iActive=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, iActive );
+    INFO_4( "%s (%u) aKeyEvent.iCode=%x aType=%x", __FILE__, __LINE__, aKeyEvent.iCode, aType );
+    
     if ( iActive )
         {
         		if(AknLayoutUtils::PenEnabled())
@@ -551,7 +553,7 @@
                     iStateControl.DisableKeyguardL( ETrue );
                     break;
                 default:
-        						RDebug::Printf( "%s %s (%u) default=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
+        						INFO_4( "%s %s (%u) default=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
                     break;
                 }
             }