diff -r 91c2fb4b78df -r ba54057fe027 phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp
--- a/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp	Tue Apr 27 16:37:10 2010 +0300
+++ b/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp	Tue May 11 16:13:03 2010 +0300
@@ -60,6 +60,7 @@
 #include "cphonevcchandler.h"
 #include "cphonecallforwardqueryhandler.h"
 #include "cphonekeys.h"
+#include "phoneui.hrh"
 
 // CONSTANTS
 const TInt KMaxLengthForSIPURIFirstLine = 15;
@@ -385,13 +386,19 @@
             handled = ETrue;
             }
             break;
+        case EPhoneCmdUnattendedTransferCallBackCancel:
+            if ( NeedToRestoreKeyLock() )
+                 {
+                 SetKeyLockEnabledL( ETrue );
+                 SetNeedToRestoreKeyLock( EFalse );
+                 }
+            // intended fall-through
         case EPhoneInCallCmdUnattendedTransfer:
         case EPhoneCmdTransferDialerOk:
         case EPhoneCmdTransferDialerExit:
         case EPhoneCmdTransferDialerSearch:
         case EPhoneCmdTransferDialerContactFetch:
         case EPhoneCmdUnattendedTransferCallBackOk:
-        case EPhoneCmdUnattendedTransferCallBackCancel:
             // intended fall-through
             iTransferCmdHandler->HandleCommandL( aCommand );
             handled = ETrue;
@@ -429,6 +436,15 @@
             handled = ETrue;
             break;
             
+       case EPhoneCmdRejectUnattendedTransfer:
+            if ( NeedToRestoreKeyLock() )
+                {
+                SetKeyLockEnabledL( ETrue );
+                SetNeedToRestoreKeyLock( EFalse );
+                } 
+            handled = ETrue;
+            break;
+			
         default:
             {
             RArray<CTelMenuExtension::TCallInfo> array;
@@ -598,8 +614,11 @@
         case MEngineMonitor::EPEMessageTransferring:
             {
             iViewCommandHandle.ExecuteCommandL( EPhoneViewRemoveGlobalNote );
-            CPhoneState* phoneState = 
-                static_cast< CPhoneState* >( iStateMachine.State() );    
+            break;
+            }
+        case MEngineMonitor::EPEMessageTransferDone:
+            {
+            iViewCommandHandle.ExecuteCommandL( EPhoneViewRemoveGlobalNote );
             SendGlobalInfoNoteL( EPhoneInCallTransferred );
             break; 
             }
@@ -610,9 +629,28 @@
             }
         case MEngineMonitor::EPEMessageTransferCallBackRequest:
             {
+            if ( iStateMachine.State()->IsKeyLockOn()  )
+                {
+                SetNeedToRestoreKeyLock( ETrue );
+                SetKeyLockEnabledL( EFalse );      
+                }
             iTransferCmdHandler->LaunchCallBackQueryL();
             break;
             }
+		case MEngineMonitor::EPEMessageIdle:
+            {
+            TPhoneCmdParamInteger activeCallCount;
+            iViewCommandHandle.ExecuteCommandL(
+                    EPhoneViewGetCountOfActiveCalls, &activeCallCount );
+            
+            if ( ENoActiveCalls == activeCallCount.Integer() 
+                 && NeedToRestoreKeyLock() )
+                {
+                SetKeyLockEnabledL( ETrue );
+                SetNeedToRestoreKeyLock( EFalse );
+                }
+			break;
+			}
         default:
             handled = EFalse;
             break;
@@ -1530,4 +1568,50 @@
     return phoneNumber;
     }
 
+// ---------------------------------------------------------------------------
+// CPhoneCustomizationVoip::SetKeyLockEnabledL
+// ---------------------------------------------------------------------------
+//
+void CPhoneCustomizationVoip::SetKeyLockEnabledL( TBool aEnabled )
+    {
+    __LOGMETHODSTARTEND( PhoneUIVoIPExtension, 
+        "CPhoneCustomizationVoip::CPhoneCustomizationVoip::SetKeyLockEnabledL" );
+    if ( aEnabled )
+        {
+        iViewCommandHandle.ExecuteCommandL(
+                                  EPhoneViewEnableKeyLock );
+        }
+    else
+        {
+        iViewCommandHandle.ExecuteCommandL(
+                              EPhoneViewDisableKeyLockWithoutNote );
+        }           
+    }
+
+// ---------------------------------------------------------------------------
+// CPhoneCustomizationVoip::SetNeedToRestoreKeyLock
+// ---------------------------------------------------------------------------
+//
+void CPhoneCustomizationVoip::SetNeedToRestoreKeyLock( TBool aRestore )
+    {
+    __LOGMETHODSTARTEND( PhoneUIVoIPExtension, 
+          "CPhoneCustomizationVoip::CPhoneCustomizationVoip::SetNeedToRestoreKeyLock" );
+    __PHONELOG1( EBasic, PhoneUIVoIPExtension, 
+               "CPhoneCustomizationVoip::AwrNeedToRestoreKeyLock:%d", aRestore );
+    iNeedToRestoreKeyLock = aRestore;
+    }
+
+// -----------------------------------------------------------
+// CPhoneCustomizationVoip::NeedToRestoreKeyLock
+// -----------------------------------------------------------
+//
+TBool CPhoneCustomizationVoip::NeedToRestoreKeyLock() const
+    {
+    __LOGMETHODSTARTEND( PhoneUIVoIPExtension, 
+          "CPhoneCustomizationVoip::CPhoneCustomizationVoip::NeedToRestoreKeyLock" );
+    __PHONELOG1( EBasic, PhoneUIVoIPExtension, 
+            "CPhoneCustomizationVoip::NeedToRestoreKeyLock:%d", iNeedToRestoreKeyLock );
+    return iNeedToRestoreKeyLock;
+    }
+
 // End of File