diff -r 24062c24fe38 -r 2a26698d78ba phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -19,8 +19,6 @@
 // INCLUDES
 #include <StringLoader.h>
 #include <cpephonemodelif.h>
-#include <featmgr.h>
-#include <telephonyvariant.hrh>
 #include "cphoneconferenceandwaiting.h"
 #include "mphonestatemachine.h"
 #include "phoneviewcommanddefinitions.h"
@@ -34,8 +32,6 @@
 #include "phonerssbase.h"
 #include "tphonecmdparamglobalnote.h"
 #include "phoneui.hrh"
-#include "cphonecenrepproxy.h"
-#include "mphonestorage.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -171,22 +167,6 @@
     }
 
 // -----------------------------------------------------------
-// CPhoneConferenceAndWaiting::HandleKeyEventL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndWaiting::HandleKeyEventL(
-    const TKeyEvent& aKeyEvent,
-    TEventCode aEventCode )
-    {
-    if( EKeyDeviceF == aKeyEvent.iCode )
-        {
-        __PHONELOG( EBasic, EPhoneUIStates,
-            "CPhoneConferenceAndWaiting::HandleKeyMessageL-deviceF" );
-        HandleHoldSwitchL();
-        }
-    }
-
-// -----------------------------------------------------------
 // CPhoneConferenceAndWaiting::HandleErrorL
 // -----------------------------------------------------------
 //
@@ -286,15 +266,6 @@
     {
     __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()");
     
-    if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
-        && iStateMachine->PhoneStorage()->IsScreenLocked() )
-        {
-        EnableCallUIL();
-        }
-    
-    // Reset blocked keys list
-    iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-    
     // Effect is shown when dialer exist.
     TBool effectStarted ( EFalse );
     if ( !NeedToReturnToForegroundAppL() )
@@ -405,15 +376,6 @@
                 }
             }
         
-        if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
-            && iStateMachine->PhoneStorage()->IsScreenLocked() )
-            {
-            EnableCallUIL();
-            }
-        
-        // Reset blocked keys list
-        iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-
         if ( iViewCommandHandle->HandleCommandL( EPhoneViewIsConferenceInExpandedMode ) 
                 == EPhoneViewResponseSuccess )
             {
@@ -499,9 +461,6 @@
                 SetNumberEntryVisibilityL(EFalse);   
                 }
             
-            // Check if HW Keys or Call UI should be disabled
-            CheckDisableHWKeysAndCallUIL();
-            
             SetTouchPaneButtons( EPhoneIncomingCallButtons );
             SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
             SetRingingTonePlaybackL( iRingingCallId );          
@@ -519,9 +478,6 @@
             // Go to waiting in single state
             UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
             
-            // Check if HW Keys or Call UI should be disabled
-            CheckDisableHWKeysAndCallUIL();
-            
             SetTouchPaneButtons( EPhoneWaitingCallButtons );             
             iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
             break;
@@ -535,9 +491,6 @@
             // Go to two singles and waiting state
             UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
             
-            // Check if HW Keys or Call UI should be disabled
-            CheckDisableHWKeysAndCallUIL();
-            
             SetTouchPaneButtons( EPhoneWaitingCallButtons );               
 
             iStateMachine->ChangeState( EPhoneStateTwoSinglesAndWaiting );