--- a/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp	Fri Sep 03 16:56:10 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp	Wed Sep 22 18:06:15 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-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"
@@ -41,6 +41,7 @@
 #include <AknSgcc.h>
 //#include "sysapappui.h"
 #include <w32std.h>
+#include <avkondomainpskeys.h>
 
 
 const TInt KModifierMask( 0 );
@@ -288,8 +289,8 @@
     TInt value(0);
     TBool retval(EFalse);
 
-    RProperty::Get( KPSUidCoreApplicationUIs, KCoreAppUIsAutolockStatus, value );
-    if ( value > EAutolockOff )
+    RProperty::Get(  KPSUidAvkonDomain, KAknKeyguardStatus, value );
+    if ( value > EKeyguardNotActive )
         {
         retval = ETrue;
         }