diff -r 6e226572c5f0 -r ece4bbb094df securitydialogs/Autolock/src/AutoLockLockObserver.cpp
--- a/securitydialogs/Autolock/src/AutoLockLockObserver.cpp	Fri Mar 12 15:46:51 2010 +0200
+++ b/securitydialogs/Autolock/src/AutoLockLockObserver.cpp	Mon Mar 15 12:43:21 2010 +0200
@@ -21,9 +21,7 @@
 #include		<e32property.h>
 #include	<PSVariables.h>
 #include		<coreapplicationuisdomainpskeys.h>
-#include <SCPClient.h>	// EMKK-7N3G7R
-#include		<startupdomainpskeys.h>	// EMKK-7N3G7R
-#include <mmtsy_names.h>	// EMKK-7N3G7R 
+
 #include	"AutoLockLockObserverPS.h"
 #include	"AutolockAppUiPS.h"
 #include	"AutoLockModelPS.h"
@@ -54,14 +52,6 @@
 		{
 		Cancel();
 		iProperty.Close();
-#ifdef FF_STARTUP_OMA_DM_SUPPORT	// New booting order	Start	EMKK-7N3G7R			
-		delete wait;
-		if (iServer.Handle())
-			{						
-				iServer.UnloadPhoneModule(KMmTsyModuleName);
-				iServer.Close();
-			}
-#endif	// End EMKK-7N3G7R	
 		}
 //
 // ----------------------------------------------------------
@@ -97,12 +87,13 @@
 void CLockObserver::ConstructL()
 		{
 	    
-		#if	defined(_DEBUG)	
-        RDebug::Print(_L("(AUTOLOCK)CLockObserver::ConstructL()"));
+	#if	defined(_DEBUG)	
+    RDebug::Print(_L("(AUTOLOCK)CLockObserver::ConstructL()"));
     #endif
         
 		// Add this	active object	to the scheduler.
 	CActiveScheduler::Add(this);
+	    
 	TInt ret;
 	_LIT_SECURITY_POLICY_PASS(KReadPolicy);	
 	_LIT_SECURITY_POLICY_C1(KWritePolicy,	ECapabilityWriteDeviceData);