--- a/phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp	Mon Mar 15 12:40:24 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp	Wed Mar 31 21:30:06 2010 +0300
@@ -22,7 +22,7 @@
 #include <UikonInternalPSKeys.h>
 #include <startupdomainpskeys.h>
 #include <hwrmdomainpskeys.h>
-#include <oem/SimLockUiKeys.h>
+#include <oem/simlockuikeys.h>
 #include <featmgr.h>
 #include <coreapplicationuisdomainpskeys.h>
 
@@ -90,6 +90,13 @@
         KPSUidStartup,
         KStartupSimSecurityStatus,
         this );
+    
+    // Set up notifications for autolock state changes.
+    CPhonePubSubProxy::Instance()->NotifyChangeL(
+    	KPSUidCoreApplicationUIs,
+    	KCoreAppUIsAutolockStatus,
+    	this );
+    
 
     if ( CPhoneCenRepProxy::Instance()->IsTelephonyFeatureSupported(
             KTelephonyLVFlagSwivelInDevice ))
@@ -223,7 +230,7 @@
     const TUint aKey,
     const TInt aValue )
     {
-    iStateMachine->State()->HandlePropertyChangedL( aCategory, aKey, aValue );
+    iStateMachine->HandlePropertyChangedL( aCategory, aKey, aValue );
     }
 
 // -----------------------------------------------------------