diff -r 2b9c00e2ab55 -r 150a5dd64ae5 securitydialogs/SecUi/Src/SecUiSecuritySettings.cpp
--- a/securitydialogs/SecUi/Src/SecUiSecuritySettings.cpp	Mon Mar 08 21:44:12 2010 +0000
+++ b/securitydialogs/SecUi/Src/SecUiSecuritySettings.cpp	Sun Mar 14 13:12:09 2010 +0000
@@ -993,34 +993,6 @@
     
     CleanupStack::PopAndDestroy();    // items
     
-    if(FeatureManager::FeatureSupported(KFeatureIdSapTerminalControlFw ))
-		{
-    TBool allow = ETrue;               
-               
-    if ((aPeriod == 0) && (maxPeriod > 0))
-       {
-        #if defined(_DEBUG)
-        RDebug::Print(_L("(SECUI)CSecuritySettings::ChangeAutoLockPeriodL() \
-        The period: %d is not allowed by TARM; max: %d"),aPeriod, maxPeriod );
-        #endif                
-        allow = EFalse;                                                
-        HBufC* prompt;
-        prompt = StringLoader::LoadLC( R_SECUI_TEXT_AUTOLOCK_MUST_BE_ACTIVE );
-        CAknNoteDialog* noteDlg = new (ELeave) CAknNoteDialog( REINTERPRET_CAST(CEikDialog**,&noteDlg) );
-        noteDlg->PrepareLC( R_CODE_ERROR );
-        noteDlg->SetTextL( *prompt );
-        noteDlg->SetTimeout( CAknNoteDialog::ELongTimeout );
-        noteDlg->SetTone( CAknNoteDialog::EErrorTone );
-        noteDlg->RunLD();                    
-                    
-        CleanupStack::PopAndDestroy( prompt );                      
-        }          
-        
-    if ( !allow ) 
-        {
-         return ChangeAutoLockPeriodL( oldPeriod );
-        }                       
-  }
 
     if (aPeriod == 0)
         {