Revision: 201033 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 14 Sep 2010 21:18:17 +0300
branchRCL_3
changeset 26 8baf28733c3d
parent 25 5266b1f337bd
Revision: 201033 Kit: 201035
phone_plat/telephony_matching_extension_api/inc/telmatchingextension.h
phoneapp/phoneui/group/bld.inf
phoneapp/phoneui/loc/variedcallhandling.loc
phoneapp/phoneui/srcdata/phoneui.rss
phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def
phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def
phoneapp/phoneuicontrol/group/phoneuicontrol.mmp
phoneapp/phoneuicontrol/inc/cphonestate.h
phoneapp/phoneuicontrol/inc/tphonetransitionhandler.h
phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp
phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp
phoneapp/phoneuicontrol/src/cphonestate.cpp
phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp
phoneapp/phoneuicontrol/src/cphonestateidle.cpp
phoneapp/phoneuicontrol/src/cphonestateincall.cpp
phoneapp/phoneuicontrol/src/cphonestateincoming.cpp
phoneapp/phoneuicontrol/src/tphonetransitionhandler.cpp
phoneapp/phoneuistates/inc/cphoneconference.h
phoneapp/phoneuistates/inc/cphoneerrormessageshandler.h
phoneapp/phoneuistates/src/cphonealerting.cpp
phoneapp/phoneuistates/src/cphonecallsetup.cpp
phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp
phoneapp/phoneuistates/src/cphoneconference.cpp
phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp
phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp
phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp
phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp
phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp
phoneapp/phoneuistates/src/cphoneemergency.cpp
phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp
phoneapp/phoneuistates/src/cphoneincoming.cpp
phoneapp/phoneuistates/src/cphonesingleandalerting.cpp
phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp
phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp
phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp
phoneapp/phoneuistates/src/cphonesinglecall.cpp
phoneapp/phoneuistates/src/cphonetwosingles.cpp
phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp
phoneapp/phoneuiutils/inc/cphoneresourceresolverbase.h
phoneapp/phoneuiutils/inc/tphonecmdparamtranseffect.h
phoneapp/phoneuiutils/inc/tphonecommandparam.h
phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp
phoneapp/phoneuiutils/src/tphonecmdparamtranseffect.cpp
phoneapp/phoneuiview/inc/c3dringingtoneinterface.inl
phoneapp/phoneuiview/src/cphonebubblewrapper.cpp
phoneapp/phoneuiview/src/cphoneviewcontroller.cpp
phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp
phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp
phoneapp/silenceactionplugin/data/silenceringingtone_activate.rul
phoneengine/contacthandling/inc/cpecontactextensionwrapper.h
phoneengine/contacthandling/src/cpecontactextensionwrapper.cpp
phoneengine/contacthandling/src/cpecontactmatch.cpp
phoneengine/engineinfo/inc/cpecallinfo.h
phoneengine/engineinfo/inc/cpeengineinfoimpl.h
phoneengine/engineinfo/inc/mpeengineinfo.h
phoneengine/engineinfo/src/cpecallinfo.cpp
phoneengine/engineinfo/src/cpeengineinfoimpl.cpp
phoneengine/phonemodel/cenrep/keys_s60telephony.xls
phoneengine/phonemodel/conf/s60telephony.confml
phoneengine/phonemodel/conf/s60telephony_101F87E3.crml
phoneengine/phonemodel/conf/s60telephony_102828F8.crml
phoneengine/phonemodel/group/bld.inf
phoneengine/phonemodel/inc/cpephonemodel.h
phoneengine/phonemodel/inc/telephonyvariant.hrh
phoneengine/phonemodel/rom/phonengengine.iby
phoneengine/phonemodel/src/cpephonemodel.cpp
phonesettings/aiwcallimageplugin/src/aiwcallimageplugin.cpp
phoneuis/BubbleManager/Inc/BMUtils.h
phoneuis/BubbleManager/Src/BMUtils.cpp
phoneuis/Ussd/src/UssdAppUi.cpp
phoneuis/dialer/inc/cdialernumberentry.h
phoneuis/dialer/src/cdialernumberentry.cpp
phoneuis/easydialing/src/easydialingutils.cpp
--- a/phone_plat/telephony_matching_extension_api/inc/telmatchingextension.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phone_plat/telephony_matching_extension_api/inc/telmatchingextension.h	Tue Sep 14 21:18:17 2010 +0300
@@ -69,9 +69,14 @@
     *                            of address will be used for matching (e.g. by value 0).
     *                            If length of the address is less than value of the parameter the whole
     *                            of address will be used for matching.
+	* @param aAllowUserNameMatch - ETrue on return if matching using the user name part of 
+    *                              the address is allowed.
     * @return - Return KErrNone if operation succeed.
     */
-    virtual TInt GetAddressForMatching( RBuf& aParsedAddress, TInt& aMeaningfulDigits ) = 0;
+    virtual TInt GetAddressForMatching( 
+        RBuf& aParsedAddress, 
+        TInt& aMeaningfulDigits, 
+        TBool& aAllowUserNameMatch ) = 0;
 
     /**
     * Returns contact store uris which are opened and will be used for matching.
--- a/phoneapp/phoneui/group/bld.inf	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneui/group/bld.inf	Tue Sep 14 21:18:17 2010 +0300
@@ -50,7 +50,7 @@
 ../loc/phone.loc                                APP_LAYER_LOC_EXPORT_PATH(phone.loc)
 ../loc/voip.loc                                 APP_LAYER_LOC_EXPORT_PATH(voip.loc)
 ../loc/dialer.loc    				APP_LAYER_LOC_EXPORT_PATH(dialer.loc)
-
+../loc/variedcallhandling.loc 			APP_LAYER_LOC_EXPORT_PATH(variedcallhandling.loc)
 
 PRJ_EXTENSIONS
 START EXTENSION s60/mifconv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui/loc/variedcallhandling.loc	Tue Sep 14 21:18:17 2010 +0300
@@ -0,0 +1,225 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*     This is a localisation file for Phone
+*     A .loc file is the one and only place where the logical strings
+*     to be localised are defined.
+*
+*/
+
+
+// LOCALISATION STRINGS
+
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCUnassignedNumber.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_1 "Dialled number is unavailable -01-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCNoRouteToDestination.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_3 "Unavailable -03-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCOperatorDeterminedBarring.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_8 "Unavailable -08-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCUserBusy.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_17 "User busy"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCUserNotResponding.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_18 "No answer -18-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCCallRejected.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_21 "Unavailable -21-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCNumberChanged.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_22 "Dialled number is unavailable -22-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCDestinationOutOfOrder.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_27 "Unavailable -27-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCFacilityRejected.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_29 "Call ended -29-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCNetworkOutOfOrder.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_38 "Call ended -38-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCTemporaryFailure.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_41 "Call ended -41-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCSwitchingEquipmentCongestion.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_42 "Call ended -42-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCAccessInformationDiscarded.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_43 "Call ended -43-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCRequestedChannelNotAvailable.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_44 "Call ended -44-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCResourceNotAvailable.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_47 "Call ended -47-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCIncomingCallsBarredInCug.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_55 "Call ended -55-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCBearerCapabilityNotAuthorised.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_57 "Call ended -57-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCServiceNotAvailable.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_63 "Call ended -63-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCBearerServiceNotImplemented.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_65 "Call ended -65-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCRequestedFacilityNotImplemented.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_69 "Call ended -69-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCUserNotInCug.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_87 "Call ended -87-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCIncompatibleDestination.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_88 "Call ended -88-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCSemanticallyIncorrectMessage.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_95 "Call ended -95-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCUnspecifiedProtocolError.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_111 "Call ended -111-"
+
+// d: It is used in varied error note when
+// d: call termination cause is KErrGsmCCUnspecifiedInterworkingError.
+// l: popup_note_window
+// w:
+//
+#define qtn_var_cause_127 "Call ended -127-"
+
+// d: It is used in varied error note
+// l: popup_note_window
+// w:
+//
+#define qtn_var_number_unassigned_param "Dialled number is unavailable -%d-"
+
+// d: It is used in varied error note
+// l: popup_note_window
+// w:
+//
+#define qtn_var_unavailable_param "Unavailable -%d-"
+
+// d: It is used in varied error note
+// l: popup_note_window
+// w:
+//
+#define qtn_var_no_answer_param "No answer -%d-"
+
+// d: It is used in varied error note
+// l: popup_note_window
+// w:
+//
+#define qtn_var_call_ended_param "Call ended -%d-"
+
+
+
--- a/phoneapp/phoneui/srcdata/phoneui.rss	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneui/srcdata/phoneui.rss	Tue Sep 14 21:18:17 2010 +0300
@@ -48,6 +48,7 @@
 #include    <mobileoriginatedcalls.loc>
 #include    <avkon.loc>
 #include    <dialer.loc>
+#include    <variedcallhandling.loc>
 
 
 #include    <dtmfsignalling.loc>
@@ -8183,5 +8184,322 @@
     buf = qtn_called_number_has_barred_incoming_calls;
     }
 
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_1
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_1
+    {
+    buf = qtn_var_cause_1;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_3
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_3
+    {
+    buf = qtn_var_cause_3;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_8
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_8
+    {
+    buf = qtn_var_cause_8;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_17
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_17
+    {
+    buf = qtn_var_cause_17;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_18
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_18
+    {
+    buf = qtn_var_cause_18;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_21
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_21
+    {
+    buf = qtn_var_cause_21;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_22
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_22
+    {
+    buf = qtn_var_cause_22;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_27
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_27
+    {
+    buf = qtn_var_cause_27;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_29
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_29
+    {
+    buf = qtn_var_cause_29;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_38
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_38
+    {
+    buf = qtn_var_cause_38;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_41
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_41
+    {
+    buf = qtn_var_cause_41;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_42
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_42
+    {
+    buf = qtn_var_cause_42;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_43
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_43
+    {
+    buf = qtn_var_cause_43;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_44
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_44
+    {
+    buf = qtn_var_cause_44;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_47
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_47
+    {
+    buf = qtn_var_cause_47;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_55
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_55
+    {
+    buf = qtn_var_cause_55;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_57
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_57
+    {
+    buf = qtn_var_cause_57;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_63
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_63
+    {
+    buf = qtn_var_cause_63;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_65
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_65
+    {
+    buf = qtn_var_cause_65;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_69
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_69
+    {
+    buf = qtn_var_cause_69;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_87
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_87
+    {
+    buf = qtn_var_cause_87;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_88
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_88
+    {
+    buf = qtn_var_cause_88;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_95
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_95
+    {
+    buf = qtn_var_cause_95;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_111
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_111
+    {
+    buf = qtn_var_cause_111;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_cause_127
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_cause_127
+    {
+    buf = qtn_var_cause_127;
+    }
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_number_unassigned_param
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_number_unassigned_param
+    {
+    buf = qtn_var_number_unassigned_param;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_unavailable_param
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_unavailable_param
+    {
+    buf = qtn_var_unavailable_param;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_no_answer_param
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_no_answer_param
+    {
+    buf = qtn_var_no_answer_param;
+    }
+
+// -----------------------------------------------------------------------------
+//
+//    r_note_var_call_ended_param
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_note_var_call_ended_param
+    {
+    buf = qtn_var_call_ended_param;
+    }
 //##########################################################
 // End of File
--- a/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def	Tue Sep 14 21:18:17 2010 +0300
@@ -3,245 +3,249 @@
 	?HandleKeyMessageL@CPhoneStateIncoming@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 2 NONAME ; void CPhoneStateIncoming::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
 	?TopAppIsDisplayedL@CPhoneState@@IBEHXZ @ 3 NONAME ; int CPhoneState::TopAppIsDisplayedL(void) const
 	?HandleKeyMessageL@CPhoneStateCallSetup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 4 NONAME ; void CPhoneStateCallSetup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?SetContextMenuL@CPhoneState@@MAEXH@Z @ 5 NONAME ; void CPhoneState::SetContextMenuL(int)
-	?CallFetchedNumberL@CPhoneStateInCall@@MAEXABVTDesC16@@@Z @ 6 NONAME ; void CPhoneStateInCall::CallFetchedNumberL(class TDesC16 const &)
-	?DisconnectCallL@CPhoneState@@MAEXXZ @ 7 NONAME ; void CPhoneState::DisconnectCallL(void)
-	?SetCbaL@CPhoneCbaManager@@QAEXH@Z @ 8 NONAME ; void CPhoneCbaManager::SetCbaL(int)
-	?InstanceL@CPhoneReconnectQuery@@SAPAV1@XZ @ 9 NONAME ; class CPhoneReconnectQuery * CPhoneReconnectQuery::InstanceL(void)
-	?HandlePhoneStartupL@CPhoneState@@UAEXXZ @ 10 NONAME ; void CPhoneState::HandlePhoneStartupL(void)
-	?HandlePhoneFocusLostEventL@CPhoneStateIdle@@UAEXXZ @ 11 NONAME ; void CPhoneStateIdle::HandlePhoneFocusLostEventL(void)
-	?HandleIdleL@CPhoneStateInCall@@IAEXH@Z @ 12 NONAME ; void CPhoneStateInCall::HandleIdleL(int)
-	?ShowQueryL@CPhoneState@@IAEXH@Z @ 13 NONAME ; void CPhoneState::ShowQueryL(int)
-	?PhoneNumberAvailableInPhoneEngineL@CPhoneStateInCall@@IAEXH@Z @ 14 NONAME ; void CPhoneStateInCall::PhoneNumberAvailableInPhoneEngineL(int)
-	?DisplayCallTerminationNoteL@CPhoneState@@IAEXXZ @ 15 NONAME ; void CPhoneState::DisplayCallTerminationNoteL(void)
-	??0CPhoneStateInCall@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 16 NONAME ; CPhoneStateInCall::CPhoneStateInCall(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?HandleNumberLongKeyPressL@CPhoneStateIdle@@IAEXXZ @ 17 NONAME ; void CPhoneStateIdle::HandleNumberLongKeyPressL(void)
-	?HandlePropertyChangedL@CPhoneStateMachine@@UAEXABVTUid@@IH@Z @ 18 NONAME ; void CPhoneStateMachine::HandlePropertyChangedL(class TUid const &, unsigned int, int)
-	?PhoneEngine@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@XZ @ 19 NONAME ; class MPEPhoneModel * CPhoneStateMachine::PhoneEngine(void)
-	?OpenMenuBarL@CPhoneStateCallSetup@@MAEXXZ @ 20 NONAME ; void CPhoneStateCallSetup::OpenMenuBarL(void)
-	??1CPhoneStateCallSetup@@UAE@XZ @ 21 NONAME ; CPhoneStateCallSetup::~CPhoneStateCallSetup(void)
-	?HandleEnvironmentChangeL@CPhoneUIController@@UAEXH@Z @ 22 NONAME ; void CPhoneUIController::HandleEnvironmentChangeL(int)
-	?SetToolbarButtonLoudspeakerEnabled@CPhoneState@@IAEXXZ @ 23 NONAME ; void CPhoneState::SetToolbarButtonLoudspeakerEnabled(void)
-	?Instance@CPhoneStateHandle@@SAPAV1@XZ @ 24 NONAME ; class CPhoneStateHandle * CPhoneStateHandle::Instance(void)
-	?HandleNumberEntryClearedL@CPhoneStateIdle@@MAEXXZ @ 25 NONAME ; void CPhoneStateIdle::HandleNumberEntryClearedL(void)
-	?DynInitMenuPaneL@CPhoneStateIncoming@@MAEXHPAVCEikMenuPane@@@Z @ 26 NONAME ; void CPhoneStateIncoming::DynInitMenuPaneL(int, class CEikMenuPane *)
-	?HandleCommandL@CPhoneState@@UAEHH@Z @ 27 NONAME ; int CPhoneState::HandleCommandL(int)
-	?StartAlsLineChangeTimerL@CPhoneState@@IAEXXZ @ 28 NONAME ; void CPhoneState::StartAlsLineChangeTimerL(void)
-	?IsNumberEntryVisibleL@CPhoneState@@QAEHXZ @ 29 NONAME ; int CPhoneState::IsNumberEntryVisibleL(void)
-	?HandlePhoneEngineMessageL@CPhoneStateIdle@@UAEXHH@Z @ 30 NONAME ; void CPhoneStateIdle::HandlePhoneEngineMessageL(int, int)
-	?HandleDialingL@CPhoneStateIdle@@MAEXH@Z @ 31 NONAME ; void CPhoneStateIdle::HandleDialingL(int)
-	?CustomizedDialerCbaResourceIdL@CPhoneState@@IAEHXZ @ 32 NONAME ; int CPhoneState::CustomizedDialerCbaResourceIdL(void)
-	?CaptureKeysDuringCallNotificationL@CPhoneState@@IAEXH@Z @ 33 NONAME ; void CPhoneState::CaptureKeysDuringCallNotificationL(int)
-	?HandleKeyPressDurationL@CPhoneState@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 34 NONAME ; void CPhoneState::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
-	?DisplayCallSetupL@CPhoneState@@IAEXH@Z @ 35 NONAME ; void CPhoneState::DisplayCallSetupL(int)
-	?RegisterStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 36 NONAME ; void CPhoneSecurityModeObserver::RegisterStateObserver(class MPhoneSecurityModeChangeObserver &)
-	?DoStateSpecificCallSetUpDefinitionsL@CPhoneState@@UAEXXZ @ 37 NONAME ; void CPhoneState::DoStateSpecificCallSetUpDefinitionsL(void)
-	?SetToolbarButtonHandsetEnabled@CPhoneState@@IAEXXZ @ 38 NONAME ; void CPhoneState::SetToolbarButtonHandsetEnabled(void)
-	?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 39 NONAME ; void CPhoneStateMachine::ChangeState(int)
-	?NewL@CPhoneUIController@@SAPAV1@AAVCPhoneViewController@@@Z @ 40 NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class CPhoneViewController &)
-	?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 41 NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void)
-	?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 42 NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int)
-	?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 43 NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void)
-	?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 44 NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 45 NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
-	?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 46 NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void)
-	?HandleCenRepChangeL@CPhoneState@@UAEXABVTUid@@I@Z @ 47 NONAME ; void CPhoneState::HandleCenRepChangeL(class TUid const &, unsigned int)
-	?HandleLongHashL@CPhoneState@@UAEXXZ @ 48 NONAME ; void CPhoneState::HandleLongHashL(void)
-	?DialL@CPhoneStateIdle@@MAEXABVTDesC16@@W4TPhoneNumberType@@W4TDialInitiationMethod@1@@Z @ 49 NONAME ; void CPhoneStateIdle::DialL(class TDesC16 const &, enum TPhoneNumberType, enum CPhoneStateIdle::TDialInitiationMethod)
-	?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 50 NONAME ; void CPhoneState::ShowNumberBusyNoteL(void)
-	?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 51 NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(void)
-	?HandleIdleForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 52 NONAME ; void CPhoneStateIdle::HandleIdleForegroundEventL(void)
-	?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 53 NONAME ; void CPhoneState::HandleDisconnectingL(int)
-	?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 54 NONAME ; void CPhoneState::HandleAudioMuteChangedL(void)
-	?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 55 NONAME ; int CPhoneStateIncoming::HandleCommandL(int)
-	?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 56 NONAME ; void CPhoneState::UpdateSingleActiveCallL(int)
-	?IsOnScreenDialerSupported@CPhoneState@@IBEHXZ @ 57 NONAME ; int CPhoneState::IsOnScreenDialerSupported(void) const
-	?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 58 NONAME ; enum TPESimState CPhoneState::SimState(void) const
-	?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 59 NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?SetupIdleScreenInBackgroundL@CPhoneState@@IAEXXZ @ 60 NONAME ; void CPhoneState::SetupIdleScreenInBackgroundL(void)
-	?SendGlobalWarningNoteL@CPhoneState@@IAEXH@Z @ 61 NONAME ; void CPhoneState::SendGlobalWarningNoteL(int)
-	?CompleteSatRequestL@CPhoneState@@IAEXH@Z @ 62 NONAME ; void CPhoneState::CompleteSatRequestL(int)
-	?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 63 NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?LaunchNewCallQueryL@CPhoneStateInCall@@IAEXXZ @ 64 NONAME ; void CPhoneStateInCall::LaunchNewCallQueryL(void)
-	?SetCallHeaderTextsForCallComingInL@CPhoneState@@IAEXHHPAVTPhoneCmdParamCallHeaderData@@@Z @ 65 NONAME ; void CPhoneState::SetCallHeaderTextsForCallComingInL(int, int, class TPhoneCmdParamCallHeaderData *)
-	?HandlePhoneEngineMessageL@CPhoneStateMachine@@UAEXHH@Z @ 66 NONAME ; void CPhoneStateMachine::HandlePhoneEngineMessageL(int, int)
-	?IsSecurityMode@CPhoneSecurityModeObserver@@UAEHXZ @ 67 NONAME ; int CPhoneSecurityModeObserver::IsSecurityMode(void)
-	?IsSimOk@CPhoneState@@QAEHXZ @ 68 NONAME ; int CPhoneState::IsSimOk(void)
-	?ClearNumberEntryContentCache@CPhoneState@@IAEXXZ @ 69 NONAME ; void CPhoneState::ClearNumberEntryContentCache(void)
-	?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 70 NONAME ; int CPhoneStateIdle::HandleCommandL(int)
-	?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 71 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void)
-	?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 72 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void)
-	?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 73 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void)
-	?IsKeyLockOn@CPhoneState@@MBEHXZ @ 74 NONAME ; int CPhoneState::IsKeyLockOn(void) const
-	??1CPhoneStateInCall@@UAE@XZ @ 75 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void)
-	?CustomizedDialerMenuResourceIdL@CPhoneState@@IAEHXZ @ 76 NONAME ; int CPhoneState::CustomizedDialerMenuResourceIdL(void)
-	?ShowReconnectQueryL@CPhoneReconnectQuery@@QAEXH@Z @ 77 NONAME ; void CPhoneReconnectQuery::ShowReconnectQueryL(int)
-	?UpdateSilenceButtonDimming@CPhoneState@@IAEXXZ @ 78 NONAME ; void CPhoneState::UpdateSilenceButtonDimming(void)
-	?SetNumberEntryVisibilityL@CPhoneState@@IAEXH@Z @ 79 NONAME ; void CPhoneState::SetNumberEntryVisibilityL(int)
-	?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 80 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &)
-	?ConstructL@CPhoneStateInCall@@MAEXXZ @ 81 NONAME ; void CPhoneStateInCall::ConstructL(void)
-	?OnlyHashInNumberEntryL@CPhoneStateIdle@@MAEXXZ @ 82 NONAME ; void CPhoneStateIdle::OnlyHashInNumberEntryL(void)
-	?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 83 NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void)
-	?IsAutolockEnabled@CPhoneSecurityModeObserver@@UAEHXZ @ 84 NONAME ; int CPhoneSecurityModeObserver::IsAutolockEnabled(void)
-	?HandlePhoneForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 85 NONAME ; void CPhoneStateIdle::HandlePhoneForegroundEventL(void)
-	?CloseDtmfQueryL@CPhoneStateInCall@@IAEXXZ @ 86 NONAME ; void CPhoneStateInCall::CloseDtmfQueryL(void)
-	?DynInitMenuBarL@CPhoneState@@UAEXHPAVCEikMenuBar@@@Z @ 87 NONAME ; void CPhoneState::DynInitMenuBarL(int, class CEikMenuBar *)
-	?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 88 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
-	?HandleNumberEntryEdited@CPhoneState@@MAEXXZ @ 89 NONAME ; void CPhoneState::HandleNumberEntryEdited(void)
-	?EikonEnv@CPhoneStateMachine@@QBEPAVCEikonEnv@@XZ @ 90 NONAME ; class CEikonEnv * CPhoneStateMachine::EikonEnv(void) const
-	?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 91 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int)
-	?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 92 NONAME ; void CPhoneState::DialMultimediaCallL(void)
-	?HandleCreateNumberEntryL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 93 NONAME ; void CPhoneStateStartup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
-	?IsMenuBarVisibleL@CPhoneState@@UBEHXZ @ 94 NONAME ; int CPhoneState::IsMenuBarVisibleL(void) const
-	?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 95 NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &)
-	?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 96 NONAME ; int CPhoneStateCallSetup::HandleCommandL(int)
-	?SecurityMode@CPhoneStateMachine@@UAEPAVMPhoneSecurityModeObserver@@XZ @ 97 NONAME ; class MPhoneSecurityModeObserver * CPhoneStateMachine::SecurityMode(void)
-	?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 98 NONAME ; void CPhoneState::HandleAudioOutputChangedL(void)
-	??1CPhoneUIController@@UAE@XZ @ 99 NONAME ; CPhoneUIController::~CPhoneUIController(void)
-	?ForwardPEMessageToPhoneCustomizationL@CPhoneState@@IAEHHH@Z @ 100 NONAME ; int CPhoneState::ForwardPEMessageToPhoneCustomizationL(int, int)
-	?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 101 NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?UpdateIncomingContextMenuL@CPhoneState@@MAEXH@Z @ 102 NONAME ; void CPhoneState::UpdateIncomingContextMenuL(int)
-	?OpenMenuBarL@CPhoneStateInCall@@MAEXXZ @ 103 NONAME ; void CPhoneStateInCall::OpenMenuBarL(void)
-	?UpdateIncomingCbaL@CPhoneCbaManager@@QAEXH@Z @ 104 NONAME ; void CPhoneCbaManager::UpdateIncomingCbaL(int)
-	?SetTouchPaneButtonDisabled@CPhoneState@@IAEXH@Z @ 105 NONAME ; void CPhoneState::SetTouchPaneButtonDisabled(int)
-	?SetToolbarButtonBTHFEnabled@CPhoneState@@IAEXXZ @ 106 NONAME ; void CPhoneState::SetToolbarButtonBTHFEnabled(void)
-	?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 107 NONAME ; void CPhoneStateIncoming::ConstructL(void)
-	?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 108 NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &)
-	?SetTouchPaneButtons@CPhoneState@@IAEXH@Z @ 109 NONAME ; void CPhoneState::SetTouchPaneButtons(int)
-	?HandleIdleForegroundEventL@CPhoneStateStartup@@UAEXXZ @ 110 NONAME ; void CPhoneStateStartup::HandleIdleForegroundEventL(void)
-	?CallFromNumberEntryL@CPhoneState@@IAEXXZ @ 111 NONAME ; void CPhoneState::CallFromNumberEntryL(void)
-	?UpdateCbaL@CPhoneCbaManager@@QAEXH@Z @ 112 NONAME ; void CPhoneCbaManager::UpdateCbaL(int)
-	?IsVideoCall@CPhoneState@@IAEHH@Z @ 113 NONAME ; int CPhoneState::IsVideoCall(int)
-	?IsSwivelClosed@CPhoneState@@QBEHXZ @ 114 NONAME ; int CPhoneState::IsSwivelClosed(void) const
-	?CloseCustomizedDialerL@CPhoneState@@QAEXXZ @ 115 NONAME ; void CPhoneState::CloseCustomizedDialerL(void)
-	?HandlePhoneForegroundEventL@CPhoneUIController@@UAEXXZ @ 116 NONAME ; void CPhoneUIController::HandlePhoneForegroundEventL(void)
-	?CheckIfRestoreNEContentAfterDtmfDialer@CPhoneState@@IAEXXZ @ 117 NONAME ; void CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer(void)
-	?UpdateInCallContextMenuL@CPhoneState@@UAEXXZ @ 118 NONAME ; void CPhoneState::UpdateInCallContextMenuL(void)
-	?HandleNumericKeyEventL@CPhoneState@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 119 NONAME ; void CPhoneState::HandleNumericKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?SetToolbarDimming@CPhoneState@@IAEXH@Z @ 120 NONAME ; void CPhoneState::SetToolbarDimming(int)
-	?SendGlobalErrorNoteL@CPhoneState@@QAEXH@Z @ 121 NONAME ; void CPhoneState::SendGlobalErrorNoteL(int)
-	?IsAutoLockOn@CPhoneState@@UBEHXZ @ 122 NONAME ; int CPhoneState::IsAutoLockOn(void) const
-	?UpdateCbaL@CPhoneStateCallSetup@@MAEXH@Z @ 123 NONAME ; void CPhoneStateCallSetup::UpdateCbaL(int)
-	?RestoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 124 NONAME ; void CPhoneState::RestoreNumberEntryContentL(void)
-	?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 125 NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?IsNumberEntryContentStored@CPhoneState@@IAEHXZ @ 126 NONAME ; int CPhoneState::IsNumberEntryContentStored(void)
-	?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 127 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void)
-	?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 128 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void)
-	?DialVoiceCallL@CPhoneState@@IAEXXZ @ 129 NONAME ; void CPhoneState::DialVoiceCallL(void)
-	?EndUiUpdate@CPhoneState@@IAEXXZ @ 130 NONAME ; void CPhoneState::EndUiUpdate(void)
-	?HandleKeyPressDurationL@CPhoneStateIncoming@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 131 NONAME ; void CPhoneStateIncoming::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
-	?UpdateInCallCbaL@CPhoneStateInCall@@MAEXXZ @ 132 NONAME ; void CPhoneStateInCall::UpdateInCallCbaL(void)
-	?EndTransEffect@CPhoneState@@QAEXXZ @ 133 NONAME ; void CPhoneState::EndTransEffect(void)
-	?HandleEnvironmentChangeL@CPhoneState@@UAEXH@Z @ 134 NONAME ; void CPhoneState::HandleEnvironmentChangeL(int)
-	?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 135 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 136 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int)
-	?ProcessCommandL@CPhoneState@@UAEHH@Z @ 137 NONAME ; int CPhoneState::ProcessCommandL(int)
-	?BeginUiUpdateLC@CPhoneState@@IAEXXZ @ 138 NONAME ; void CPhoneState::BeginUiUpdateLC(void)
-	?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 139 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void)
-	?RemoveStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 140 NONAME ; void CPhoneSecurityModeObserver::RemoveStateObserver(class MPhoneSecurityModeChangeObserver &)
-	?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 141 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void)
-	?CreateNumberEntryL@CPhoneStateInCall@@IAEXXZ @ 142 NONAME ; void CPhoneStateInCall::CreateNumberEntryL(void)
-	?HandleSystemEventL@CPhoneUIController@@UAEXABVTWsEvent@@@Z @ 143 NONAME ; void CPhoneUIController::HandleSystemEventL(class TWsEvent const &)
-	?DynInitMenuPaneL@CPhoneUIController@@UAEXHPAVCEikMenuPane@@@Z @ 144 NONAME ; void CPhoneUIController::DynInitMenuPaneL(int, class CEikMenuPane *)
-	??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 145 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?GetRemoteInfoDataL@CPhoneState@@IAEXHAAVTDes16@@@Z @ 146 NONAME ; void CPhoneState::GetRemoteInfoDataL(int, class TDes16 &)
-	?UpdateCbaL@CPhoneStateInCall@@MAEXH@Z @ 147 NONAME ; void CPhoneStateInCall::UpdateCbaL(int)
-	?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 148 NONAME ; void CPhoneStateMachine::SetCallId(int)
-	?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 149 NONAME ; int CPhoneUIController::ProcessCommandL(int)
-	?DisplayHeaderForCallComingInL@CPhoneState@@IAEXHH@Z @ 150 NONAME ; void CPhoneState::DisplayHeaderForCallComingInL(int, int)
-	??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 151 NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 152 NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int)
-	??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 153 NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 154 NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 155 NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
-	?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 156 NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?HandlePEConstructionReadyL@CPhoneStateStartup@@QAEXH@Z @ 157 NONAME ; void CPhoneStateStartup::HandlePEConstructionReadyL(int)
-	?HandleForegroundEventL@CPhoneUIController@@UAEXH@Z @ 158 NONAME ; void CPhoneUIController::HandleForegroundEventL(int)
-	?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 159 NONAME ; void CPhoneStateIdle::HandleSendCommandL(void)
-	?DoStateSpecificCallSetUpDefinitionsL@CPhoneStateIdle@@UAEXXZ @ 160 NONAME ; void CPhoneStateIdle::DoStateSpecificCallSetUpDefinitionsL(void)
-	?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 161 NONAME ; int CPhoneUIController::HandleCommandL(int)
-	?HandleCreateNumberEntryL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 162 NONAME ; void CPhoneState::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
-	?DisplayHeaderForOutgoingCallL@CPhoneState@@IAEXH@Z @ 163 NONAME ; void CPhoneState::DisplayHeaderForOutgoingCallL(int)
-	?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 164 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int)
-	?IsSpeedDialNumber@CPhoneStateIdle@@IBEHABVTDesC16@@@Z @ 165 NONAME ; int CPhoneStateIdle::IsSpeedDialNumber(class TDesC16 const &) const
-	?IsNumberEntryUsedL@CPhoneState@@UAEHXZ @ 166 NONAME ; int CPhoneState::IsNumberEntryUsedL(void)
-	??1CPhoneState@@UAE@XZ @ 167 NONAME ; CPhoneState::~CPhoneState(void)
-	?HandleCreateNumberEntryL@CPhoneStateCallSetup@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 168 NONAME ; void CPhoneStateCallSetup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
-	?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 169 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int)
-	?HandlePhoneFocusLostEventL@CPhoneState@@UAEXXZ @ 170 NONAME ; void CPhoneState::HandlePhoneFocusLostEventL(void)
-	?HandlePropertyChangedL@CPhoneStateInCall@@EAEXABVTUid@@IH@Z @ 171 NONAME ; void CPhoneStateInCall::HandlePropertyChangedL(class TUid const &, unsigned int, int)
-	??1CPhoneStateMachine@@UAE@XZ @ 172 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void)
-	?HandleIdleForegroundEventL@CPhoneState@@UAEXXZ @ 173 NONAME ; void CPhoneState::HandleIdleForegroundEventL(void)
-	?DynInitMenuPaneL@CPhoneState@@UAEXHPAVCEikMenuPane@@@Z @ 174 NONAME ; void CPhoneState::DynInitMenuPaneL(int, class CEikMenuPane *)
-	?IsDTMFEditorVisibleL@CPhoneState@@IBEHXZ @ 175 NONAME ; int CPhoneState::IsDTMFEditorVisibleL(void) const
-	?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 176 NONAME ; void CPhoneStateCallSetup::ConstructL(void)
-	?BeginTransEffectLC@CPhoneState@@QAEXW4TStateTransEffectType@@@Z @ 177 NONAME ; void CPhoneState::BeginTransEffectLC(enum TStateTransEffectType)
-	?SetSecurityModeObserver@CPhoneStateMachine@@UAEXPAVMPhoneSecurityModeObserver@@@Z @ 178 NONAME ; void CPhoneStateMachine::SetSecurityModeObserver(class MPhoneSecurityModeObserver *)
-	?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 179 NONAME ; void CPhoneUIController::HandleMessage(int, int)
-	?HandleSystemEventL@CPhoneState@@UAEXABVTWsEvent@@@Z @ 180 NONAME ; void CPhoneState::HandleSystemEventL(class TWsEvent const &)
-	?NeedToReturnToForegroundAppL@CPhoneState@@IBEHXZ @ 181 NONAME ; int CPhoneState::NeedToReturnToForegroundAppL(void) const
-	?ConstructL@CPhoneStateStartup@@MAEXXZ @ 182 NONAME ; void CPhoneStateStartup::ConstructL(void)
-	?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 183 NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?ShowNoteL@CPhoneState@@IAEXH@Z @ 184 NONAME ; void CPhoneState::ShowNoteL(int)
-	?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 185 NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int)
-	?IsAnyQueryActiveL@CPhoneState@@QAEHXZ @ 186 NONAME ; int CPhoneState::IsAnyQueryActiveL(void)
-	?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 187 NONAME ; class MPhoneState * CPhoneStateMachine::State(void)
-	?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 188 NONAME ; void CPhoneState::SetHandsfreeModeL(int)
-	?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 189 NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const
-	?UpdateInCallCbaL@CPhoneStateCallSetup@@MAEXXZ @ 190 NONAME ; void CPhoneStateCallSetup::UpdateInCallCbaL(void)
-	?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 191 NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void)
-	??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 192 NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	??1CPhoneStateIncoming@@UAE@XZ @ 193 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void)
-	?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 194 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void)
-	?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 195 NONAME ; int CPhoneStateIdle::ProcessCommandL(int)
-	?IsNoteVisibleL@CPhoneState@@MAEHXZ @ 196 NONAME ; int CPhoneState::IsNoteVisibleL(void)
-	?DynInitMenuBarL@CPhoneUIController@@UAEXHPAVCEikMenuBar@@@Z @ 197 NONAME ; void CPhoneUIController::DynInitMenuBarL(int, class CEikMenuBar *)
-	?IsAlphanumericSupportedAndCharInput@CPhoneState@@MAEHABUTKeyEvent@@@Z @ 198 NONAME ; int CPhoneState::IsAlphanumericSupportedAndCharInput(struct TKeyEvent const &)
-	?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 199 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int)
-	?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 200 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 201 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?HandleNumberEntryClearedL@CPhoneState@@MAEXXZ @ 202 NONAME ; void CPhoneState::HandleNumberEntryClearedL(void)
-	?OnlyHashInNumberEntryL@CPhoneState@@MAEXXZ @ 203 NONAME ; void CPhoneState::OnlyHashInNumberEntryL(void)
-	?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 204 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void)
-	?ConstructL@CPhoneStateIdle@@MAEXXZ @ 205 NONAME ; void CPhoneStateIdle::ConstructL(void)
-	?SetEikonEnv@CPhoneState@@UAEXPAVCEikonEnv@@@Z @ 206 NONAME ; void CPhoneState::SetEikonEnv(class CEikonEnv *)
-	?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 207 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void)
-	?SetCallHeaderType@CPhoneState@@IAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 208 NONAME ; void CPhoneState::SetCallHeaderType(enum CBubbleManager::TPhoneCallTypeFlags)
-	?SendGlobalInfoNoteL@CPhoneState@@QAEXH@Z @ 209 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int)
-	?DisplayIdleScreenL@CPhoneState@@IAEXXZ @ 210 NONAME ; void CPhoneState::DisplayIdleScreenL(void)
-	?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 211 NONAME ; void CPhoneState::StartShowSecurityNoteL(void)
-	?StoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 212 NONAME ; void CPhoneState::StoreNumberEntryContentL(void)
-	?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 213 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int)
-	?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 214 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int)
-	?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 215 NONAME ; void CPhoneState::SetDefaultFlagsL(void)
-	?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 216 NONAME ; int CPhoneStateInCall::HandleCommandL(int)
-	?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 217 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void)
-	?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 218 NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int)
-	?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 219 NONAME ; int CPhoneStateInCall::GetRingingCallL(void)
-	?EikonEnv@CPhoneState@@QBEPAVCEikonEnv@@XZ @ 220 NONAME ; class CEikonEnv * CPhoneState::EikonEnv(void) const
-	?HandleIdleForegroundEventL@CPhoneUIController@@UAEXXZ @ 221 NONAME ; void CPhoneUIController::HandleIdleForegroundEventL(void)
-	?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 222 NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void)
-	?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 223 NONAME ; void CPhoneState::HandleForegroundEventL(int)
-	?CloseClearNumberEntryAndLoadEffectL@CPhoneState@@QAEXW4TStateTransEffectType@@@Z @ 224 NONAME ; void CPhoneState::CloseClearNumberEntryAndLoadEffectL(enum TStateTransEffectType)
-	?HandleErrorL@CPhoneStateIdle@@UAEXABUTPEErrorInfo@@@Z @ 225 NONAME ; void CPhoneStateIdle::HandleErrorL(struct TPEErrorInfo const &)
-	?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 226 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
-	?SetSecurityMessageHandler@CPhoneStateMachine@@UAEXPAVMPhoneSecurityMessageHandler@@@Z @ 227 NONAME ; void CPhoneStateMachine::SetSecurityMessageHandler(class MPhoneSecurityMessageHandler *)
-	?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 228 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
-	??1CPhoneStateIdle@@UAE@XZ @ 229 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
-	?IsDialingExtensionInFocusL@CPhoneState@@QBEHXZ @ 230 NONAME ; int CPhoneState::IsDialingExtensionInFocusL(void) const
-	?Initialize@CPhoneSecurityModeObserver@@UAEXXZ @ 231 NONAME ; void CPhoneSecurityModeObserver::Initialize(void)
-	?PhoneNumberFromEntryLC@CPhoneState@@IAEPAVHBufC16@@XZ @ 232 NONAME ; class HBufC16 * CPhoneState::PhoneNumberFromEntryLC(void)
-	?BaseConstructL@CPhoneState@@QAEXXZ @ 233 NONAME ; void CPhoneState::BaseConstructL(void)
-	?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 234 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
-	?SpeedDialL@CPhoneStateIdle@@IAEXABIW4TDialInitiationMethod@1@@Z @ 235 NONAME ; void CPhoneStateIdle::SpeedDialL(unsigned int const &, enum CPhoneStateIdle::TDialInitiationMethod)
-	?SetTouchPaneButtonEnabled@CPhoneState@@IAEXH@Z @ 236 NONAME ; void CPhoneState::SetTouchPaneButtonEnabled(int)
-	?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 237 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
-	?SpeedDialCanceledL@CPhoneStateIdle@@IAEXABI@Z @ 238 NONAME ; void CPhoneStateIdle::SpeedDialCanceledL(unsigned int const &)
-	?CloseDTMFEditorL@CPhoneState@@IAEXXZ @ 239 NONAME ; void CPhoneState::CloseDTMFEditorL(void)
-	?SetTouchPaneVisible@CPhoneState@@IAEXH@Z @ 240 NONAME ; void CPhoneState::SetTouchPaneVisible(int)
-	?HandlePhoneFocusLostEventL@CPhoneUIController@@UAEXXZ @ 241 NONAME ; void CPhoneUIController::HandlePhoneFocusLostEventL(void)
-	??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 242 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
-	??1CPhoneStateStartup@@UAE@XZ @ 243 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
-	?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 244 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?SetNeedToReturnToForegroundAppStatusL@CPhoneState@@IAEXH@Z @ 245 NONAME ; void CPhoneState::SetNeedToReturnToForegroundAppStatusL(int)
+	?CloseClearNumberEntryAndLoadEffectL@CPhoneState@@QAEXW4TPhoneTransEffectType@@@Z @ 5 NONAME ; void CPhoneState::CloseClearNumberEntryAndLoadEffectL(enum TPhoneTransEffectType)
+	?SetContextMenuL@CPhoneState@@MAEXH@Z @ 6 NONAME ; void CPhoneState::SetContextMenuL(int)
+	?CallFetchedNumberL@CPhoneStateInCall@@MAEXABVTDesC16@@@Z @ 7 NONAME ; void CPhoneStateInCall::CallFetchedNumberL(class TDesC16 const &)
+	?DisconnectCallL@CPhoneState@@MAEXXZ @ 8 NONAME ; void CPhoneState::DisconnectCallL(void)
+	?SetCbaL@CPhoneCbaManager@@QAEXH@Z @ 9 NONAME ; void CPhoneCbaManager::SetCbaL(int)
+	?InstanceL@CPhoneReconnectQuery@@SAPAV1@XZ @ 10 NONAME ; class CPhoneReconnectQuery * CPhoneReconnectQuery::InstanceL(void)
+	?HandlePhoneStartupL@CPhoneState@@UAEXXZ @ 11 NONAME ; void CPhoneState::HandlePhoneStartupL(void)
+	?HandlePhoneFocusLostEventL@CPhoneStateIdle@@UAEXXZ @ 12 NONAME ; void CPhoneStateIdle::HandlePhoneFocusLostEventL(void)
+	?HandleIdleL@CPhoneStateInCall@@IAEXH@Z @ 13 NONAME ; void CPhoneStateInCall::HandleIdleL(int)
+	?EndTransEffect@TPhoneTransitionHandler@@QAEXXZ @ 14 NONAME ; void TPhoneTransitionHandler::EndTransEffect(void)
+	?ShowQueryL@CPhoneState@@IAEXH@Z @ 15 NONAME ; void CPhoneState::ShowQueryL(int)
+	?PhoneNumberAvailableInPhoneEngineL@CPhoneStateInCall@@IAEXH@Z @ 16 NONAME ; void CPhoneStateInCall::PhoneNumberAvailableInPhoneEngineL(int)
+	?DisplayCallTerminationNoteL@CPhoneState@@IAEXXZ @ 17 NONAME ; void CPhoneState::DisplayCallTerminationNoteL(void)
+	??0CPhoneStateInCall@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 18 NONAME ; CPhoneStateInCall::CPhoneStateInCall(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?HandleNumberLongKeyPressL@CPhoneStateIdle@@IAEXXZ @ 19 NONAME ; void CPhoneStateIdle::HandleNumberLongKeyPressL(void)
+	?HandlePropertyChangedL@CPhoneStateMachine@@UAEXABVTUid@@IH@Z @ 20 NONAME ; void CPhoneStateMachine::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+	?PhoneEngine@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@XZ @ 21 NONAME ; class MPEPhoneModel * CPhoneStateMachine::PhoneEngine(void)
+	?OpenMenuBarL@CPhoneStateCallSetup@@MAEXXZ @ 22 NONAME ; void CPhoneStateCallSetup::OpenMenuBarL(void)
+	??1CPhoneStateCallSetup@@UAE@XZ @ 23 NONAME ; CPhoneStateCallSetup::~CPhoneStateCallSetup(void)
+	?HandleEnvironmentChangeL@CPhoneUIController@@UAEXH@Z @ 24 NONAME ; void CPhoneUIController::HandleEnvironmentChangeL(int)
+	?SetToolbarButtonLoudspeakerEnabled@CPhoneState@@IAEXXZ @ 25 NONAME ; void CPhoneState::SetToolbarButtonLoudspeakerEnabled(void)
+	?Instance@CPhoneStateHandle@@SAPAV1@XZ @ 26 NONAME ; class CPhoneStateHandle * CPhoneStateHandle::Instance(void)
+	?HandleNumberEntryClearedL@CPhoneStateIdle@@MAEXXZ @ 27 NONAME ; void CPhoneStateIdle::HandleNumberEntryClearedL(void)
+	?DynInitMenuPaneL@CPhoneStateIncoming@@MAEXHPAVCEikMenuPane@@@Z @ 28 NONAME ; void CPhoneStateIncoming::DynInitMenuPaneL(int, class CEikMenuPane *)
+	?HandleCommandL@CPhoneState@@UAEHH@Z @ 29 NONAME ; int CPhoneState::HandleCommandL(int)
+	?StartAlsLineChangeTimerL@CPhoneState@@IAEXXZ @ 30 NONAME ; void CPhoneState::StartAlsLineChangeTimerL(void)
+	?IsNumberEntryVisibleL@CPhoneState@@QAEHXZ @ 31 NONAME ; int CPhoneState::IsNumberEntryVisibleL(void)
+	?HandlePhoneEngineMessageL@CPhoneStateIdle@@UAEXHH@Z @ 32 NONAME ; void CPhoneStateIdle::HandlePhoneEngineMessageL(int, int)
+	?HandleDialingL@CPhoneStateIdle@@MAEXH@Z @ 33 NONAME ; void CPhoneStateIdle::HandleDialingL(int)
+	?BeginTransEffectLC@TPhoneTransitionHandler@@QAEXW4TPhoneTransEffectType@@@Z @ 34 NONAME ; void TPhoneTransitionHandler::BeginTransEffectLC(enum TPhoneTransEffectType)
+	?CustomizedDialerCbaResourceIdL@CPhoneState@@IAEHXZ @ 35 NONAME ; int CPhoneState::CustomizedDialerCbaResourceIdL(void)
+	?CaptureKeysDuringCallNotificationL@CPhoneState@@IAEXH@Z @ 36 NONAME ; void CPhoneState::CaptureKeysDuringCallNotificationL(int)
+	?HandleKeyPressDurationL@CPhoneState@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 37 NONAME ; void CPhoneState::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
+	?DisplayCallSetupL@CPhoneState@@IAEXH@Z @ 38 NONAME ; void CPhoneState::DisplayCallSetupL(int)
+	?RegisterStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 39 NONAME ; void CPhoneSecurityModeObserver::RegisterStateObserver(class MPhoneSecurityModeChangeObserver &)
+	?DoStateSpecificCallSetUpDefinitionsL@CPhoneState@@UAEXXZ @ 40 NONAME ; void CPhoneState::DoStateSpecificCallSetUpDefinitionsL(void)
+	?SetToolbarButtonHandsetEnabled@CPhoneState@@IAEXXZ @ 41 NONAME ; void CPhoneState::SetToolbarButtonHandsetEnabled(void)
+	?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 42 NONAME ; void CPhoneStateMachine::ChangeState(int)
+	?NewL@CPhoneUIController@@SAPAV1@AAVCPhoneViewController@@@Z @ 43 NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class CPhoneViewController &)
+	?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 44 NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void)
+	?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 45 NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int)
+	?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 46 NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void)
+	?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 47 NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 48 NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+	?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 49 NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void)
+	?HandleCenRepChangeL@CPhoneState@@UAEXABVTUid@@I@Z @ 50 NONAME ; void CPhoneState::HandleCenRepChangeL(class TUid const &, unsigned int)
+	?HandleLongHashL@CPhoneState@@UAEXXZ @ 51 NONAME ; void CPhoneState::HandleLongHashL(void)
+	?DialL@CPhoneStateIdle@@MAEXABVTDesC16@@W4TPhoneNumberType@@W4TDialInitiationMethod@1@@Z @ 52 NONAME ; void CPhoneStateIdle::DialL(class TDesC16 const &, enum TPhoneNumberType, enum CPhoneStateIdle::TDialInitiationMethod)
+	?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 53 NONAME ; void CPhoneState::ShowNumberBusyNoteL(void)
+	?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 54 NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(void)
+	?HandleIdleForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 55 NONAME ; void CPhoneStateIdle::HandleIdleForegroundEventL(void)
+	?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 56 NONAME ; void CPhoneState::HandleDisconnectingL(int)
+	?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 57 NONAME ; void CPhoneState::HandleAudioMuteChangedL(void)
+	?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 58 NONAME ; int CPhoneStateIncoming::HandleCommandL(int)
+	?EndUiUpdateAndEffect@TPhoneTransitionHandler@@QAEXXZ @ 59 NONAME ; void TPhoneTransitionHandler::EndUiUpdateAndEffect(void)
+	?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 60 NONAME ; void CPhoneState::UpdateSingleActiveCallL(int)
+	?IsOnScreenDialerSupported@CPhoneState@@IBEHXZ @ 61 NONAME ; int CPhoneState::IsOnScreenDialerSupported(void) const
+	?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 62 NONAME ; enum TPESimState CPhoneState::SimState(void) const
+	?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 63 NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?SetupIdleScreenInBackgroundL@CPhoneState@@IAEXXZ @ 64 NONAME ; void CPhoneState::SetupIdleScreenInBackgroundL(void)
+	?SendGlobalWarningNoteL@CPhoneState@@IAEXH@Z @ 65 NONAME ; void CPhoneState::SendGlobalWarningNoteL(int)
+	?CompleteSatRequestL@CPhoneState@@IAEXH@Z @ 66 NONAME ; void CPhoneState::CompleteSatRequestL(int)
+	?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 67 NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?LaunchNewCallQueryL@CPhoneStateInCall@@IAEXXZ @ 68 NONAME ; void CPhoneStateInCall::LaunchNewCallQueryL(void)
+	?SetCallHeaderTextsForCallComingInL@CPhoneState@@IAEXHHPAVTPhoneCmdParamCallHeaderData@@@Z @ 69 NONAME ; void CPhoneState::SetCallHeaderTextsForCallComingInL(int, int, class TPhoneCmdParamCallHeaderData *)
+	?HandlePhoneEngineMessageL@CPhoneStateMachine@@UAEXHH@Z @ 70 NONAME ; void CPhoneStateMachine::HandlePhoneEngineMessageL(int, int)
+	?IsSecurityMode@CPhoneSecurityModeObserver@@UAEHXZ @ 71 NONAME ; int CPhoneSecurityModeObserver::IsSecurityMode(void)
+	?IsSimOk@CPhoneState@@QAEHXZ @ 72 NONAME ; int CPhoneState::IsSimOk(void)
+	?ClearNumberEntryContentCache@CPhoneState@@IAEXXZ @ 73 NONAME ; void CPhoneState::ClearNumberEntryContentCache(void)
+	?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 74 NONAME ; int CPhoneStateIdle::HandleCommandL(int)
+	?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 75 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void)
+	?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 76 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void)
+	?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 77 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void)
+	?IsKeyLockOn@CPhoneState@@MBEHXZ @ 78 NONAME ; int CPhoneState::IsKeyLockOn(void) const
+	??1CPhoneStateInCall@@UAE@XZ @ 79 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void)
+	?TransitionHandlerL@CPhoneState@@QAEAAVTPhoneTransitionHandler@@XZ @ 80 NONAME ; class TPhoneTransitionHandler & CPhoneState::TransitionHandlerL(void)
+	?CustomizedDialerMenuResourceIdL@CPhoneState@@IAEHXZ @ 81 NONAME ; int CPhoneState::CustomizedDialerMenuResourceIdL(void)
+	?ShowReconnectQueryL@CPhoneReconnectQuery@@QAEXH@Z @ 82 NONAME ; void CPhoneReconnectQuery::ShowReconnectQueryL(int)
+	?UpdateSilenceButtonDimming@CPhoneState@@IAEXXZ @ 83 NONAME ; void CPhoneState::UpdateSilenceButtonDimming(void)
+	?SetNumberEntryVisibilityL@CPhoneState@@IAEXH@Z @ 84 NONAME ; void CPhoneState::SetNumberEntryVisibilityL(int)
+	?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 85 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &)
+	?ConstructL@CPhoneStateInCall@@MAEXXZ @ 86 NONAME ; void CPhoneStateInCall::ConstructL(void)
+	?OnlyHashInNumberEntryL@CPhoneStateIdle@@MAEXXZ @ 87 NONAME ; void CPhoneStateIdle::OnlyHashInNumberEntryL(void)
+	?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 88 NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void)
+	?IsAutolockEnabled@CPhoneSecurityModeObserver@@UAEHXZ @ 89 NONAME ; int CPhoneSecurityModeObserver::IsAutolockEnabled(void)
+	?HandlePhoneForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 90 NONAME ; void CPhoneStateIdle::HandlePhoneForegroundEventL(void)
+	?CloseDtmfQueryL@CPhoneStateInCall@@IAEXXZ @ 91 NONAME ; void CPhoneStateInCall::CloseDtmfQueryL(void)
+	?DynInitMenuBarL@CPhoneState@@UAEXHPAVCEikMenuBar@@@Z @ 92 NONAME ; void CPhoneState::DynInitMenuBarL(int, class CEikMenuBar *)
+	?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 93 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
+	?HandleNumberEntryEdited@CPhoneState@@MAEXXZ @ 94 NONAME ; void CPhoneState::HandleNumberEntryEdited(void)
+	?EikonEnv@CPhoneStateMachine@@QBEPAVCEikonEnv@@XZ @ 95 NONAME ; class CEikonEnv * CPhoneStateMachine::EikonEnv(void) const
+	?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 96 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int)
+	?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 97 NONAME ; void CPhoneState::DialMultimediaCallL(void)
+	?HandleCreateNumberEntryL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 98 NONAME ; void CPhoneStateStartup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
+	?IsMenuBarVisibleL@CPhoneState@@UBEHXZ @ 99 NONAME ; int CPhoneState::IsMenuBarVisibleL(void) const
+	?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 100 NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &)
+	?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 101 NONAME ; int CPhoneStateCallSetup::HandleCommandL(int)
+	?SecurityMode@CPhoneStateMachine@@UAEPAVMPhoneSecurityModeObserver@@XZ @ 102 NONAME ; class MPhoneSecurityModeObserver * CPhoneStateMachine::SecurityMode(void)
+	?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 103 NONAME ; void CPhoneState::HandleAudioOutputChangedL(void)
+	??1CPhoneUIController@@UAE@XZ @ 104 NONAME ; CPhoneUIController::~CPhoneUIController(void)
+	?ForwardPEMessageToPhoneCustomizationL@CPhoneState@@IAEHHH@Z @ 105 NONAME ; int CPhoneState::ForwardPEMessageToPhoneCustomizationL(int, int)
+	?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 106 NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?UpdateIncomingContextMenuL@CPhoneState@@MAEXH@Z @ 107 NONAME ; void CPhoneState::UpdateIncomingContextMenuL(int)
+	?OpenMenuBarL@CPhoneStateInCall@@MAEXXZ @ 108 NONAME ; void CPhoneStateInCall::OpenMenuBarL(void)
+	?UpdateIncomingCbaL@CPhoneCbaManager@@QAEXH@Z @ 109 NONAME ; void CPhoneCbaManager::UpdateIncomingCbaL(int)
+	?SetTouchPaneButtonDisabled@CPhoneState@@IAEXH@Z @ 110 NONAME ; void CPhoneState::SetTouchPaneButtonDisabled(int)
+	?SetToolbarButtonBTHFEnabled@CPhoneState@@IAEXXZ @ 111 NONAME ; void CPhoneState::SetToolbarButtonBTHFEnabled(void)
+	?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 112 NONAME ; void CPhoneStateIncoming::ConstructL(void)
+	?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 113 NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &)
+	?SetTouchPaneButtons@CPhoneState@@IAEXH@Z @ 114 NONAME ; void CPhoneState::SetTouchPaneButtons(int)
+	?HandleIdleForegroundEventL@CPhoneStateStartup@@UAEXXZ @ 115 NONAME ; void CPhoneStateStartup::HandleIdleForegroundEventL(void)
+	?CallFromNumberEntryL@CPhoneState@@IAEXXZ @ 116 NONAME ; void CPhoneState::CallFromNumberEntryL(void)
+	?UpdateCbaL@CPhoneCbaManager@@QAEXH@Z @ 117 NONAME ; void CPhoneCbaManager::UpdateCbaL(int)
+	?IsVideoCall@CPhoneState@@IAEHH@Z @ 118 NONAME ; int CPhoneState::IsVideoCall(int)
+	?IsSwivelClosed@CPhoneState@@QBEHXZ @ 119 NONAME ; int CPhoneState::IsSwivelClosed(void) const
+	?CloseCustomizedDialerL@CPhoneState@@QAEXXZ @ 120 NONAME ; void CPhoneState::CloseCustomizedDialerL(void)
+	?HandlePhoneForegroundEventL@CPhoneUIController@@UAEXXZ @ 121 NONAME ; void CPhoneUIController::HandlePhoneForegroundEventL(void)
+	?CheckIfRestoreNEContentAfterDtmfDialer@CPhoneState@@IAEXXZ @ 122 NONAME ; void CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer(void)
+	?UpdateInCallContextMenuL@CPhoneState@@UAEXXZ @ 123 NONAME ; void CPhoneState::UpdateInCallContextMenuL(void)
+	?HandleNumericKeyEventL@CPhoneState@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 124 NONAME ; void CPhoneState::HandleNumericKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?SetToolbarDimming@CPhoneState@@IAEXH@Z @ 125 NONAME ; void CPhoneState::SetToolbarDimming(int)
+	?SendGlobalErrorNoteL@CPhoneState@@QAEXH@Z @ 126 NONAME ; void CPhoneState::SendGlobalErrorNoteL(int)
+	?IsAutoLockOn@CPhoneState@@UBEHXZ @ 127 NONAME ; int CPhoneState::IsAutoLockOn(void) const
+	?UpdateCbaL@CPhoneStateCallSetup@@MAEXH@Z @ 128 NONAME ; void CPhoneStateCallSetup::UpdateCbaL(int)
+	?RestoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 129 NONAME ; void CPhoneState::RestoreNumberEntryContentL(void)
+	?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 130 NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?IsNumberEntryContentStored@CPhoneState@@IAEHXZ @ 131 NONAME ; int CPhoneState::IsNumberEntryContentStored(void)
+	?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 132 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void)
+	?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 133 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void)
+	?DialVoiceCallL@CPhoneState@@IAEXXZ @ 134 NONAME ; void CPhoneState::DialVoiceCallL(void)
+	?HandleKeyPressDurationL@CPhoneStateIncoming@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 135 NONAME ; void CPhoneStateIncoming::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
+	?UpdateInCallCbaL@CPhoneStateInCall@@MAEXXZ @ 136 NONAME ; void CPhoneStateInCall::UpdateInCallCbaL(void)
+	?HandleEnvironmentChangeL@CPhoneState@@UAEXH@Z @ 137 NONAME ; void CPhoneState::HandleEnvironmentChangeL(int)
+	?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 138 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 139 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int)
+	?ProcessCommandL@CPhoneState@@UAEHH@Z @ 140 NONAME ; int CPhoneState::ProcessCommandL(int)
+	?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 141 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void)
+	?RemoveStateObserver@CPhoneSecurityModeObserver@@UAEXAAVMPhoneSecurityModeChangeObserver@@@Z @ 142 NONAME ; void CPhoneSecurityModeObserver::RemoveStateObserver(class MPhoneSecurityModeChangeObserver &)
+	?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 143 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void)
+	?CreateNumberEntryL@CPhoneStateInCall@@IAEXXZ @ 144 NONAME ; void CPhoneStateInCall::CreateNumberEntryL(void)
+	?IncomingCallUiUpdateLC@TPhoneTransitionHandler@@QAEXXZ @ 145 NONAME ; void TPhoneTransitionHandler::IncomingCallUiUpdateLC(void)
+	?HandleSystemEventL@CPhoneUIController@@UAEXABVTWsEvent@@@Z @ 146 NONAME ; void CPhoneUIController::HandleSystemEventL(class TWsEvent const &)
+	?DynInitMenuPaneL@CPhoneUIController@@UAEXHPAVCEikMenuPane@@@Z @ 147 NONAME ; void CPhoneUIController::DynInitMenuPaneL(int, class CEikMenuPane *)
+	??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 148 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?GetRemoteInfoDataL@CPhoneState@@IAEXHAAVTDes16@@@Z @ 149 NONAME ; void CPhoneState::GetRemoteInfoDataL(int, class TDes16 &)
+	?UpdateCbaL@CPhoneStateInCall@@MAEXH@Z @ 150 NONAME ; void CPhoneStateInCall::UpdateCbaL(int)
+	?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 151 NONAME ; void CPhoneStateMachine::SetCallId(int)
+	?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 152 NONAME ; int CPhoneUIController::ProcessCommandL(int)
+	?DisplayHeaderForCallComingInL@CPhoneState@@IAEXHH@Z @ 153 NONAME ; void CPhoneState::DisplayHeaderForCallComingInL(int, int)
+	??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 154 NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 155 NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int)
+	?SetNeedToReturnToForegroundAppStatusL@CPhoneState@@IAEXH@Z @ 156 NONAME ; void CPhoneState::SetNeedToReturnToForegroundAppStatusL(int)
+	??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 157 NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 158 NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 159 NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
+	?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 160 NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?HandlePEConstructionReadyL@CPhoneStateStartup@@QAEXH@Z @ 161 NONAME ; void CPhoneStateStartup::HandlePEConstructionReadyL(int)
+	?HandleForegroundEventL@CPhoneUIController@@UAEXH@Z @ 162 NONAME ; void CPhoneUIController::HandleForegroundEventL(int)
+	?IdleCallUiUpdateLC@TPhoneTransitionHandler@@QAEXXZ @ 163 NONAME ; void TPhoneTransitionHandler::IdleCallUiUpdateLC(void)
+	?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 164 NONAME ; void CPhoneStateIdle::HandleSendCommandL(void)
+	?DoStateSpecificCallSetUpDefinitionsL@CPhoneStateIdle@@UAEXXZ @ 165 NONAME ; void CPhoneStateIdle::DoStateSpecificCallSetUpDefinitionsL(void)
+	?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 166 NONAME ; int CPhoneUIController::HandleCommandL(int)
+	?HandleCreateNumberEntryL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 167 NONAME ; void CPhoneState::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
+	?DisplayHeaderForOutgoingCallL@CPhoneState@@IAEXH@Z @ 168 NONAME ; void CPhoneState::DisplayHeaderForOutgoingCallL(int)
+	?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 169 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int)
+	?IsSpeedDialNumber@CPhoneStateIdle@@IBEHABVTDesC16@@@Z @ 170 NONAME ; int CPhoneStateIdle::IsSpeedDialNumber(class TDesC16 const &) const
+	?IsNumberEntryUsedL@CPhoneState@@UAEHXZ @ 171 NONAME ; int CPhoneState::IsNumberEntryUsedL(void)
+	??1CPhoneState@@UAE@XZ @ 172 NONAME ; CPhoneState::~CPhoneState(void)
+	?HandleCreateNumberEntryL@CPhoneStateCallSetup@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 173 NONAME ; void CPhoneStateCallSetup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
+	?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 174 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int)
+	?HandlePhoneFocusLostEventL@CPhoneState@@UAEXXZ @ 175 NONAME ; void CPhoneState::HandlePhoneFocusLostEventL(void)
+	?HandlePropertyChangedL@CPhoneStateInCall@@EAEXABVTUid@@IH@Z @ 176 NONAME ; void CPhoneStateInCall::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+	??1CPhoneStateMachine@@UAE@XZ @ 177 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void)
+	?HandleIdleForegroundEventL@CPhoneState@@UAEXXZ @ 178 NONAME ; void CPhoneState::HandleIdleForegroundEventL(void)
+	?DynInitMenuPaneL@CPhoneState@@UAEXHPAVCEikMenuPane@@@Z @ 179 NONAME ; void CPhoneState::DynInitMenuPaneL(int, class CEikMenuPane *)
+	?IsDTMFEditorVisibleL@CPhoneState@@IBEHXZ @ 180 NONAME ; int CPhoneState::IsDTMFEditorVisibleL(void) const
+	?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 181 NONAME ; void CPhoneStateCallSetup::ConstructL(void)
+	?SetSecurityModeObserver@CPhoneStateMachine@@UAEXPAVMPhoneSecurityModeObserver@@@Z @ 182 NONAME ; void CPhoneStateMachine::SetSecurityModeObserver(class MPhoneSecurityModeObserver *)
+	?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 183 NONAME ; void CPhoneUIController::HandleMessage(int, int)
+	?HandleSystemEventL@CPhoneState@@UAEXABVTWsEvent@@@Z @ 184 NONAME ; void CPhoneState::HandleSystemEventL(class TWsEvent const &)
+	?NeedToReturnToForegroundAppL@CPhoneState@@IBEHXZ @ 185 NONAME ; int CPhoneState::NeedToReturnToForegroundAppL(void) const
+	?ConstructL@CPhoneStateStartup@@MAEXXZ @ 186 NONAME ; void CPhoneStateStartup::ConstructL(void)
+	?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 187 NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?ShowNoteL@CPhoneState@@IAEXH@Z @ 188 NONAME ; void CPhoneState::ShowNoteL(int)
+	?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 189 NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+	?IsAnyQueryActiveL@CPhoneState@@QAEHXZ @ 190 NONAME ; int CPhoneState::IsAnyQueryActiveL(void)
+	?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 191 NONAME ; class MPhoneState * CPhoneStateMachine::State(void)
+	?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 192 NONAME ; void CPhoneState::SetHandsfreeModeL(int)
+	?EndUiUpdate@TPhoneTransitionHandler@@QAEXXZ @ 193 NONAME ; void TPhoneTransitionHandler::EndUiUpdate(void)
+	?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 194 NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const
+	?UpdateInCallCbaL@CPhoneStateCallSetup@@MAEXXZ @ 195 NONAME ; void CPhoneStateCallSetup::UpdateInCallCbaL(void)
+	?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 196 NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void)
+	??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 197 NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	??1CPhoneStateIncoming@@UAE@XZ @ 198 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void)
+	?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 199 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void)
+	?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 200 NONAME ; int CPhoneStateIdle::ProcessCommandL(int)
+	?IsNoteVisibleL@CPhoneState@@MAEHXZ @ 201 NONAME ; int CPhoneState::IsNoteVisibleL(void)
+	?DynInitMenuBarL@CPhoneUIController@@UAEXHPAVCEikMenuBar@@@Z @ 202 NONAME ; void CPhoneUIController::DynInitMenuBarL(int, class CEikMenuBar *)
+	?IsAlphanumericSupportedAndCharInput@CPhoneState@@MAEHABUTKeyEvent@@@Z @ 203 NONAME ; int CPhoneState::IsAlphanumericSupportedAndCharInput(struct TKeyEvent const &)
+	?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 204 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int)
+	?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 205 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 206 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?HandleNumberEntryClearedL@CPhoneState@@MAEXXZ @ 207 NONAME ; void CPhoneState::HandleNumberEntryClearedL(void)
+	?OnlyHashInNumberEntryL@CPhoneState@@MAEXXZ @ 208 NONAME ; void CPhoneState::OnlyHashInNumberEntryL(void)
+	?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 209 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void)
+	?ConstructL@CPhoneStateIdle@@MAEXXZ @ 210 NONAME ; void CPhoneStateIdle::ConstructL(void)
+	?SetEikonEnv@CPhoneState@@UAEXPAVCEikonEnv@@@Z @ 211 NONAME ; void CPhoneState::SetEikonEnv(class CEikonEnv *)
+	?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 212 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void)
+	?SetCallHeaderType@CPhoneState@@IAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 213 NONAME ; void CPhoneState::SetCallHeaderType(enum CBubbleManager::TPhoneCallTypeFlags)
+	?SendGlobalInfoNoteL@CPhoneState@@QAEXH@Z @ 214 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int)
+	?DisplayIdleScreenL@CPhoneState@@IAEXXZ @ 215 NONAME ; void CPhoneState::DisplayIdleScreenL(void)
+	?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 216 NONAME ; void CPhoneState::StartShowSecurityNoteL(void)
+	?StoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 217 NONAME ; void CPhoneState::StoreNumberEntryContentL(void)
+	?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 218 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int)
+	?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 219 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int)
+	?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 220 NONAME ; void CPhoneState::SetDefaultFlagsL(void)
+	?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 221 NONAME ; int CPhoneStateInCall::HandleCommandL(int)
+	?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 222 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void)
+	?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 223 NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int)
+	?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 224 NONAME ; int CPhoneStateInCall::GetRingingCallL(void)
+	?EikonEnv@CPhoneState@@QBEPAVCEikonEnv@@XZ @ 225 NONAME ; class CEikonEnv * CPhoneState::EikonEnv(void) const
+	?HandleIdleForegroundEventL@CPhoneUIController@@UAEXXZ @ 226 NONAME ; void CPhoneUIController::HandleIdleForegroundEventL(void)
+	?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 227 NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void)
+	?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 228 NONAME ; void CPhoneState::HandleForegroundEventL(int)
+	?BeginUiUpdateLC@TPhoneTransitionHandler@@QAEXXZ @ 229 NONAME ; void TPhoneTransitionHandler::BeginUiUpdateLC(void)
+	?HandleErrorL@CPhoneStateIdle@@UAEXABUTPEErrorInfo@@@Z @ 230 NONAME ; void CPhoneStateIdle::HandleErrorL(struct TPEErrorInfo const &)
+	?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 231 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
+	?SetSecurityMessageHandler@CPhoneStateMachine@@UAEXPAVMPhoneSecurityMessageHandler@@@Z @ 232 NONAME ; void CPhoneStateMachine::SetSecurityMessageHandler(class MPhoneSecurityMessageHandler *)
+	?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 233 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+	??1CPhoneStateIdle@@UAE@XZ @ 234 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
+	?IsDialingExtensionInFocusL@CPhoneState@@QBEHXZ @ 235 NONAME ; int CPhoneState::IsDialingExtensionInFocusL(void) const
+	?Initialize@CPhoneSecurityModeObserver@@UAEXXZ @ 236 NONAME ; void CPhoneSecurityModeObserver::Initialize(void)
+	?PhoneNumberFromEntryLC@CPhoneState@@IAEPAVHBufC16@@XZ @ 237 NONAME ; class HBufC16 * CPhoneState::PhoneNumberFromEntryLC(void)
+	?BaseConstructL@CPhoneState@@QAEXXZ @ 238 NONAME ; void CPhoneState::BaseConstructL(void)
+	?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 239 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
+	?SpeedDialL@CPhoneStateIdle@@IAEXABIW4TDialInitiationMethod@1@@Z @ 240 NONAME ; void CPhoneStateIdle::SpeedDialL(unsigned int const &, enum CPhoneStateIdle::TDialInitiationMethod)
+	?SetTouchPaneButtonEnabled@CPhoneState@@IAEXH@Z @ 241 NONAME ; void CPhoneState::SetTouchPaneButtonEnabled(int)
+	?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 242 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
+	?SpeedDialCanceledL@CPhoneStateIdle@@IAEXABI@Z @ 243 NONAME ; void CPhoneStateIdle::SpeedDialCanceledL(unsigned int const &)
+	?CloseDTMFEditorL@CPhoneState@@IAEXXZ @ 244 NONAME ; void CPhoneState::CloseDTMFEditorL(void)
+	?SetTouchPaneVisible@CPhoneState@@IAEXH@Z @ 245 NONAME ; void CPhoneState::SetTouchPaneVisible(int)
+	?HandlePhoneFocusLostEventL@CPhoneUIController@@UAEXXZ @ 246 NONAME ; void CPhoneUIController::HandlePhoneFocusLostEventL(void)
+	??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 247 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
+	??1CPhoneStateStartup@@UAE@XZ @ 248 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
+	?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 249 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
 
--- a/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def	Tue Sep 14 21:18:17 2010 +0300
@@ -1,468 +1,472 @@
 EXPORTS
 	_ZN11CPhoneState10ShowQueryLEi @ 1 NONAME
-	_ZN11CPhoneState11EndUiUpdateEv @ 2 NONAME
-	_ZN11CPhoneState11IsVideoCallEi @ 3 NONAME
-	_ZN11CPhoneState11SetEikonEnvEP9CEikonEnv @ 4 NONAME
-	_ZN11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 5 NONAME
-	_ZN11CPhoneState14BaseConstructLEv @ 6 NONAME
-	_ZN11CPhoneState14DialVoiceCallLEv @ 7 NONAME
-	_ZN11CPhoneState14EndTransEffectEv @ 8 NONAME
-	_ZN11CPhoneState14HandleCommandLEi @ 9 NONAME
-	_ZN11CPhoneState14IsNoteVisibleLEv @ 10 NONAME
-	_ZN11CPhoneState14ShowTextQueryLEiiiP6TDes16i @ 11 NONAME
-	_ZN11CPhoneState15BeginUiUpdateLCEv @ 12 NONAME
-	_ZN11CPhoneState15DisconnectCallLEv @ 13 NONAME
-	_ZN11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 14 NONAME
-	_ZN11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 15 NONAME
-	_ZN11CPhoneState15HandleLongHashLEv @ 16 NONAME
-	_ZN11CPhoneState15ProcessCommandLEi @ 17 NONAME
-	_ZN11CPhoneState15SetContextMenuLEi @ 18 NONAME
-	_ZN11CPhoneState16CallWaitingNoteLEi @ 19 NONAME
-	_ZN11CPhoneState16CloseDTMFEditorLEv @ 20 NONAME
-	_ZN11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 21 NONAME
-	_ZN11CPhoneState16SetDefaultFlagsLEv @ 22 NONAME
-	_ZN11CPhoneState17DisplayCallSetupLEi @ 23 NONAME
-	_ZN11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 24 NONAME
-	_ZN11CPhoneState17IsAnyQueryActiveLEv @ 25 NONAME
-	_ZN11CPhoneState17SetCallHeaderTypeEN14CBubbleManager19TPhoneCallTypeFlagsE @ 26 NONAME
-	_ZN11CPhoneState17SetHandsfreeModeLEi @ 27 NONAME
-	_ZN11CPhoneState17SetToolbarDimmingEi @ 28 NONAME
-	_ZN11CPhoneState18BeginTransEffectLCE21TStateTransEffectType @ 29 NONAME
-	_ZN11CPhoneState18DisplayIdleScreenLEv @ 30 NONAME
-	_ZN11CPhoneState18GetRemoteInfoDataLEiR6TDes16 @ 31 NONAME
-	_ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 32 NONAME
-	_ZN11CPhoneState18HandleSystemEventLERK8TWsEvent @ 33 NONAME
-	_ZN11CPhoneState18IsNumberEntryUsedLEv @ 34 NONAME
-	_ZN11CPhoneState19CompleteSatRequestLEi @ 35 NONAME
-	_ZN11CPhoneState19DialMultimediaCallLEv @ 36 NONAME
-	_ZN11CPhoneState19HandleCenRepChangeLERK4TUidj @ 37 NONAME
-	_ZN11CPhoneState19HandlePhoneStartupLEv @ 38 NONAME
-	_ZN11CPhoneState19SendGlobalInfoNoteLEi @ 39 NONAME
-	_ZN11CPhoneState19SetBTHandsfreeModeLEi @ 40 NONAME
-	_ZN11CPhoneState19SetTouchPaneButtonsEi @ 41 NONAME
-	_ZN11CPhoneState19SetTouchPaneVisibleEi @ 42 NONAME
-	_ZN11CPhoneState19ShowNumberBusyNoteLEv @ 43 NONAME
-	_ZN11CPhoneState20CallFromNumberEntryLEv @ 44 NONAME
-	_ZN11CPhoneState20DecreaseAudioVolumeLEv @ 45 NONAME
-	_ZN11CPhoneState20HandleDisconnectingLEi @ 46 NONAME
-	_ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 47 NONAME
-	_ZN11CPhoneState20IncreaseAudioVolumeLEv @ 48 NONAME
-	_ZN11CPhoneState20SendGlobalErrorNoteLEi @ 49 NONAME
-	_ZN11CPhoneState21IsNumberEntryVisibleLEv @ 50 NONAME
-	_ZN11CPhoneState21UpdateRemoteInfoDataLEi @ 51 NONAME
-	_ZN11CPhoneState22CloseCustomizedDialerLEv @ 52 NONAME
-	_ZN11CPhoneState22DeleteTouchPaneButtonsEv @ 53 NONAME
-	_ZN11CPhoneState22HandleForegroundEventLEi @ 54 NONAME
-	_ZN11CPhoneState22HandleNumericKeyEventLERK9TKeyEvent10TEventCode @ 55 NONAME
-	_ZN11CPhoneState22HandlePropertyChangedLERK4TUidji @ 56 NONAME
-	_ZN11CPhoneState22OnlyHashInNumberEntryLEv @ 57 NONAME
-	_ZN11CPhoneState22PhoneNumberFromEntryLCEv @ 58 NONAME
-	_ZN11CPhoneState22SendGlobalWarningNoteLEi @ 59 NONAME
-	_ZN11CPhoneState22StartShowSecurityNoteLEv @ 60 NONAME
-	_ZN11CPhoneState23HandleAudioMuteChangedLEv @ 61 NONAME
-	_ZN11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 62 NONAME
-	_ZN11CPhoneState23HandleNumberEntryEditedEv @ 63 NONAME
-	_ZN11CPhoneState23SetRingingTonePlaybackLEi @ 64 NONAME
-	_ZN11CPhoneState23UpdateSingleActiveCallLEi @ 65 NONAME
-	_ZN11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 66 NONAME
-	_ZN11CPhoneState24HandleEnvironmentChangeLEi @ 67 NONAME
-	_ZN11CPhoneState24StartAlsLineChangeTimerLEv @ 68 NONAME
-	_ZN11CPhoneState24StoreNumberEntryContentLEv @ 69 NONAME
-	_ZN11CPhoneState24UpdateInCallContextMenuLEv @ 70 NONAME
-	_ZN11CPhoneState25HandleAudioOutputChangedLEv @ 71 NONAME
-	_ZN11CPhoneState25HandleNumberEntryClearedLEv @ 72 NONAME
-	_ZN11CPhoneState25HandlePhoneEngineMessageLEii @ 73 NONAME
-	_ZN11CPhoneState25SetNumberEntryVisibilityLEi @ 74 NONAME
-	_ZN11CPhoneState25SetTouchPaneButtonEnabledEi @ 75 NONAME
-	_ZN11CPhoneState26HandleIdleForegroundEventLEv @ 76 NONAME
-	_ZN11CPhoneState26HandlePhoneFocusLostEventLEv @ 77 NONAME
-	_ZN11CPhoneState26IsNumberEntryContentStoredEv @ 78 NONAME
-	_ZN11CPhoneState26RestoreNumberEntryContentLEv @ 79 NONAME
-	_ZN11CPhoneState26SetTouchPaneButtonDisabledEi @ 80 NONAME
-	_ZN11CPhoneState26UpdateIncomingContextMenuLEi @ 81 NONAME
-	_ZN11CPhoneState26UpdateSilenceButtonDimmingEv @ 82 NONAME
-	_ZN11CPhoneState27DisplayCallTerminationNoteLEv @ 83 NONAME
-	_ZN11CPhoneState27HandlePhoneForegroundEventLEv @ 84 NONAME
-	_ZN11CPhoneState27SetToolbarButtonBTHFEnabledEv @ 85 NONAME
-	_ZN11CPhoneState28ClearNumberEntryContentCacheEv @ 86 NONAME
-	_ZN11CPhoneState28SetupIdleScreenInBackgroundLEv @ 87 NONAME
-	_ZN11CPhoneState29DisplayHeaderForCallComingInLEii @ 88 NONAME
-	_ZN11CPhoneState29DisplayHeaderForOutgoingCallLEi @ 89 NONAME
-	_ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 90 NONAME
-	_ZN11CPhoneState30CustomizedDialerCbaResourceIdLEv @ 91 NONAME
-	_ZN11CPhoneState30SetToolbarButtonHandsetEnabledEv @ 92 NONAME
-	_ZN11CPhoneState31CustomizedDialerMenuResourceIdLEv @ 93 NONAME
-	_ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 94 NONAME
-	_ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 95 NONAME
-	_ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 96 NONAME
-	_ZN11CPhoneState35CloseClearNumberEntryAndLoadEffectLE21TStateTransEffectType @ 97 NONAME
-	_ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 98 NONAME
-	_ZN11CPhoneState36DoStateSpecificCallSetUpDefinitionsLEv @ 99 NONAME
-	_ZN11CPhoneState37ForwardPEMessageToPhoneCustomizationLEii @ 100 NONAME
-	_ZN11CPhoneState38CheckIfRestoreNEContentAfterDtmfDialerEv @ 101 NONAME
-	_ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 102 NONAME
-	_ZN11CPhoneState7IsSimOkEv @ 103 NONAME
-	_ZN11CPhoneState9ShowNoteLEi @ 104 NONAME
-	_ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 105 NONAME
-	_ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 106 NONAME
-	_ZN11CPhoneStateD0Ev @ 107 NONAME
-	_ZN11CPhoneStateD1Ev @ 108 NONAME
-	_ZN11CPhoneStateD2Ev @ 109 NONAME
-	_ZN15CPhoneStateIdle10ConstructLEv @ 110 NONAME
-	_ZN15CPhoneStateIdle10SpeedDialLERKjNS_21TDialInitiationMethodE @ 111 NONAME
-	_ZN15CPhoneStateIdle12HandleErrorLERK12TPEErrorInfo @ 112 NONAME
-	_ZN15CPhoneStateIdle14DialVoiceCallLEv @ 113 NONAME
-	_ZN15CPhoneStateIdle14HandleCommandLEi @ 114 NONAME
-	_ZN15CPhoneStateIdle14HandleDialingLEi @ 115 NONAME
-	_ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 116 NONAME
-	_ZN15CPhoneStateIdle15ProcessCommandLEi @ 117 NONAME
-	_ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 118 NONAME
-	_ZN15CPhoneStateIdle18HandleSendCommandLEv @ 119 NONAME
-	_ZN15CPhoneStateIdle18SpeedDialCanceledLERKj @ 120 NONAME
-	_ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 121 NONAME
-	_ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 122 NONAME
-	_ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 123 NONAME
-	_ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 124 NONAME
-	_ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 125 NONAME
-	_ZN15CPhoneStateIdle25HandleNumberLongKeyPressLEv @ 126 NONAME
-	_ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 127 NONAME
-	_ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 128 NONAME
-	_ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 129 NONAME
-	_ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 130 NONAME
-	_ZN15CPhoneStateIdle36DoStateSpecificCallSetUpDefinitionsLEv @ 131 NONAME
-	_ZN15CPhoneStateIdle5DialLERK7TDesC1616TPhoneNumberTypeNS_21TDialInitiationMethodE @ 132 NONAME
-	_ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 133 NONAME
-	_ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 134 NONAME
-	_ZN15CPhoneStateIdleD0Ev @ 135 NONAME
-	_ZN15CPhoneStateIdleD1Ev @ 136 NONAME
-	_ZN15CPhoneStateIdleD2Ev @ 137 NONAME
-	_ZN16CPhoneCbaManager10UpdateCbaLEi @ 138 NONAME
-	_ZN16CPhoneCbaManager18UpdateIncomingCbaLEi @ 139 NONAME
-	_ZN16CPhoneCbaManager7SetCbaLEi @ 140 NONAME
-	_ZN17CPhoneStateHandle17ViewCommandHandleEv @ 141 NONAME
-	_ZN17CPhoneStateHandle8InstanceEv @ 142 NONAME
-	_ZN17CPhoneStateInCall10ConstructLEv @ 143 NONAME
-	_ZN17CPhoneStateInCall10UpdateCbaLEi @ 144 NONAME
-	_ZN17CPhoneStateInCall11HandleIdleLEi @ 145 NONAME
-	_ZN17CPhoneStateInCall12OpenMenuBarLEv @ 146 NONAME
-	_ZN17CPhoneStateInCall14HandleCommandLEi @ 147 NONAME
-	_ZN17CPhoneStateInCall15CloseDtmfQueryLEv @ 148 NONAME
-	_ZN17CPhoneStateInCall15GetRingingCallLEv @ 149 NONAME
-	_ZN17CPhoneStateInCall16UpdateInCallCbaLEv @ 150 NONAME
-	_ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 151 NONAME
-	_ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 152 NONAME
-	_ZN17CPhoneStateInCall18CreateNumberEntryLEv @ 153 NONAME
-	_ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 154 NONAME
-	_ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 155 NONAME
-	_ZN17CPhoneStateInCall19LaunchNewCallQueryLEv @ 156 NONAME
-	_ZN17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 157 NONAME
-	_ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 158 NONAME
-	_ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 159 NONAME
-	_ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 160 NONAME
-	_ZN17CPhoneStateInCall34PhoneNumberAvailableInPhoneEngineLEi @ 161 NONAME
-	_ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 162 NONAME
-	_ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 163 NONAME
-	_ZN17CPhoneStateInCallD0Ev @ 164 NONAME
-	_ZN17CPhoneStateInCallD1Ev @ 165 NONAME
-	_ZN17CPhoneStateInCallD2Ev @ 166 NONAME
-	_ZN18CPhoneStateMachine11ChangeStateEi @ 167 NONAME
-	_ZN18CPhoneStateMachine11PhoneEngineEv @ 168 NONAME
-	_ZN18CPhoneStateMachine12SecurityModeEv @ 169 NONAME
-	_ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 170 NONAME
-	_ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 171 NONAME
-	_ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 172 NONAME
-	_ZN18CPhoneStateMachine22HandlePropertyChangedLERK4TUidji @ 173 NONAME
-	_ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 174 NONAME
-	_ZN18CPhoneStateMachine23SetSecurityModeObserverEP26MPhoneSecurityModeObserver @ 175 NONAME
-	_ZN18CPhoneStateMachine25HandlePhoneEngineMessageLEii @ 176 NONAME
-	_ZN18CPhoneStateMachine25SetSecurityMessageHandlerEP28MPhoneSecurityMessageHandler @ 177 NONAME
-	_ZN18CPhoneStateMachine5StateEv @ 178 NONAME
-	_ZN18CPhoneStateMachine9SetCallIdEi @ 179 NONAME
-	_ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 180 NONAME
-	_ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 181 NONAME
-	_ZN18CPhoneStateMachineD0Ev @ 182 NONAME
-	_ZN18CPhoneStateMachineD1Ev @ 183 NONAME
-	_ZN18CPhoneStateMachineD2Ev @ 184 NONAME
-	_ZN18CPhoneStateStartup10ConstructLEv @ 185 NONAME
-	_ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 186 NONAME
-	_ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 187 NONAME
-	_ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 188 NONAME
-	_ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 189 NONAME
-	_ZN18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 190 NONAME
-	_ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 191 NONAME
-	_ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 192 NONAME
-	_ZN18CPhoneStateStartup26HandlePEConstructionReadyLEi @ 193 NONAME
-	_ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 194 NONAME
-	_ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 195 NONAME
-	_ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 196 NONAME
-	_ZN18CPhoneStateStartupD0Ev @ 197 NONAME
-	_ZN18CPhoneStateStartupD1Ev @ 198 NONAME
-	_ZN18CPhoneStateStartupD2Ev @ 199 NONAME
-	_ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 200 NONAME
-	_ZN18CPhoneUIController13HandleMessageEii @ 201 NONAME
-	_ZN18CPhoneUIController14HandleCommandLEi @ 202 NONAME
-	_ZN18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 203 NONAME
-	_ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 204 NONAME
-	_ZN18CPhoneUIController15ProcessCommandLEi @ 205 NONAME
-	_ZN18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 206 NONAME
-	_ZN18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 207 NONAME
-	_ZN18CPhoneUIController19HandlePhoneStartupLEv @ 208 NONAME
-	_ZN18CPhoneUIController22HandleForegroundEventLEi @ 209 NONAME
-	_ZN18CPhoneUIController24HandleEnvironmentChangeLEi @ 210 NONAME
-	_ZN18CPhoneUIController26HandleIdleForegroundEventLEv @ 211 NONAME
-	_ZN18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 212 NONAME
-	_ZN18CPhoneUIController27HandlePhoneForegroundEventLEv @ 213 NONAME
-	_ZN18CPhoneUIController4NewLER20CPhoneViewController @ 214 NONAME
-	_ZN18CPhoneUIControllerD0Ev @ 215 NONAME
-	_ZN18CPhoneUIControllerD1Ev @ 216 NONAME
-	_ZN18CPhoneUIControllerD2Ev @ 217 NONAME
-	_ZN19CPhoneStateIncoming10ConstructLEv @ 218 NONAME
-	_ZN19CPhoneStateIncoming14HandleCommandLEi @ 219 NONAME
-	_ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 220 NONAME
-	_ZN19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 221 NONAME
-	_ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 222 NONAME
-	_ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 223 NONAME
-	_ZN19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 224 NONAME
-	_ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 225 NONAME
-	_ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 226 NONAME
-	_ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 227 NONAME
-	_ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 228 NONAME
-	_ZN19CPhoneStateIncomingD0Ev @ 229 NONAME
-	_ZN19CPhoneStateIncomingD1Ev @ 230 NONAME
-	_ZN19CPhoneStateIncomingD2Ev @ 231 NONAME
-	_ZN20CPhoneReconnectQuery19ShowReconnectQueryLEi @ 232 NONAME
-	_ZN20CPhoneReconnectQuery9InstanceLEv @ 233 NONAME
-	_ZN20CPhoneStateCallSetup10ConstructLEv @ 234 NONAME
-	_ZN20CPhoneStateCallSetup10UpdateCbaLEi @ 235 NONAME
-	_ZN20CPhoneStateCallSetup12OpenMenuBarLEv @ 236 NONAME
-	_ZN20CPhoneStateCallSetup14HandleCommandLEi @ 237 NONAME
-	_ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 238 NONAME
-	_ZN20CPhoneStateCallSetup16UpdateInCallCbaLEv @ 239 NONAME
-	_ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 240 NONAME
-	_ZN20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 241 NONAME
-	_ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 242 NONAME
-	_ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 243 NONAME
-	_ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 244 NONAME
-	_ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 245 NONAME
-	_ZN20CPhoneStateCallSetupD0Ev @ 246 NONAME
-	_ZN20CPhoneStateCallSetupD1Ev @ 247 NONAME
-	_ZN20CPhoneStateCallSetupD2Ev @ 248 NONAME
-	_ZNK11CPhoneState11IsKeyLockOnEv @ 249 NONAME
-	_ZNK11CPhoneState12IsAutoLockOnEv @ 250 NONAME
-	_ZNK11CPhoneState14IsSwivelClosedEv @ 251 NONAME
-	_ZNK11CPhoneState17IsMenuBarVisibleLEv @ 252 NONAME
-	_ZNK11CPhoneState18TopAppIsDisplayedLEv @ 253 NONAME
-	_ZNK11CPhoneState20IsDTMFEditorVisibleLEv @ 254 NONAME
-	_ZNK11CPhoneState25IsOnScreenDialerSupportedEv @ 255 NONAME
-	_ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 256 NONAME
-	_ZNK11CPhoneState26IsDialingExtensionInFocusLEv @ 257 NONAME
-	_ZNK11CPhoneState28NeedToReturnToForegroundAppLEv @ 258 NONAME
-	_ZNK11CPhoneState8EikonEnvEv @ 259 NONAME
-	_ZNK11CPhoneState8SimStateEv @ 260 NONAME
-	_ZNK15CPhoneStateIdle17IsSpeedDialNumberERK7TDesC16 @ 261 NONAME
-	_ZNK18CPhoneStateMachine8EikonEnvEv @ 262 NONAME
-	_ZTI11CPhoneState @ 263 NONAME
-	_ZTI15CPhoneStateIdle @ 264 NONAME
-	_ZTI17CPhoneStateHandle @ 265 NONAME
-	_ZTI17CPhoneStateInCall @ 266 NONAME
-	_ZTI18CPhoneStateMachine @ 267 NONAME
-	_ZTI18CPhoneStateStartup @ 268 NONAME
-	_ZTI18CPhoneUIController @ 269 NONAME
-	_ZTI19CPhoneStateIncoming @ 270 NONAME
-	_ZTI20CPhoneReconnectQuery @ 271 NONAME
-	_ZTI20CPhoneStateCallSetup @ 272 NONAME
-	_ZTI23CPhoneDtmfWaitCharTimer @ 273 NONAME
-	_ZTI23CPhoneKeyEventForwarder @ 274 NONAME
-	_ZTI24CPhoneSystemEventHandler @ 275 NONAME
-	_ZTI26CPhoneRemoteControlHandler @ 276 NONAME
-	_ZTI27CPhoneBtaaDisconnectHandler @ 277 NONAME
-	_ZTV11CPhoneState @ 278 NONAME
-	_ZTV15CPhoneStateIdle @ 279 NONAME
-	_ZTV17CPhoneStateHandle @ 280 NONAME
-	_ZTV17CPhoneStateInCall @ 281 NONAME
-	_ZTV18CPhoneStateMachine @ 282 NONAME
-	_ZTV18CPhoneStateStartup @ 283 NONAME
-	_ZTV18CPhoneUIController @ 284 NONAME
-	_ZTV19CPhoneStateIncoming @ 285 NONAME
-	_ZTV20CPhoneReconnectQuery @ 286 NONAME
-	_ZTV20CPhoneStateCallSetup @ 287 NONAME
-	_ZTV23CPhoneDtmfWaitCharTimer @ 288 NONAME
-	_ZTV23CPhoneKeyEventForwarder @ 289 NONAME
-	_ZTV24CPhoneSystemEventHandler @ 290 NONAME
-	_ZTV26CPhoneRemoteControlHandler @ 291 NONAME
-	_ZTV27CPhoneBtaaDisconnectHandler @ 292 NONAME
-	_ZThn12_N11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 293 NONAME
-	_ZThn12_N11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 294 NONAME
-	_ZThn12_N11CPhoneState18HandleSystemEventLERK8TWsEvent @ 295 NONAME
-	_ZThn12_N11CPhoneState19HandleCenRepChangeLERK4TUidj @ 296 NONAME
-	_ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 297 NONAME
-	_ZThn12_N11CPhoneState22HandleForegroundEventLEi @ 298 NONAME
-	_ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 299 NONAME
-	_ZThn12_N11CPhoneState24HandleEnvironmentChangeLEi @ 300 NONAME
-	_ZThn12_N11CPhoneState26HandleIdleForegroundEventLEv @ 301 NONAME
-	_ZThn12_N11CPhoneState26HandlePhoneFocusLostEventLEv @ 302 NONAME
-	_ZThn12_N11CPhoneState27HandlePhoneForegroundEventLEv @ 303 NONAME
-	_ZThn12_N11CPhoneStateD0Ev @ 304 NONAME
-	_ZThn12_N11CPhoneStateD1Ev @ 305 NONAME
-	_ZThn12_N15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 306 NONAME
-	_ZThn12_N15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 307 NONAME
-	_ZThn12_N15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 308 NONAME
-	_ZThn12_N15CPhoneStateIdleD0Ev @ 309 NONAME
-	_ZThn12_N15CPhoneStateIdleD1Ev @ 310 NONAME
-	_ZThn12_N17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 311 NONAME
-	_ZThn12_N17CPhoneStateInCallD0Ev @ 312 NONAME
-	_ZThn12_N17CPhoneStateInCallD1Ev @ 313 NONAME
-	_ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 314 NONAME
-	_ZThn12_N18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 315 NONAME
-	_ZThn12_N18CPhoneStateStartupD0Ev @ 316 NONAME
-	_ZThn12_N18CPhoneStateStartupD1Ev @ 317 NONAME
-	_ZThn12_N18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 318 NONAME
-	_ZThn12_N18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 319 NONAME
-	_ZThn12_N18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 320 NONAME
-	_ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 321 NONAME
-	_ZThn12_N18CPhoneUIController22HandleForegroundEventLEi @ 322 NONAME
-	_ZThn12_N18CPhoneUIController24HandleEnvironmentChangeLEi @ 323 NONAME
-	_ZThn12_N18CPhoneUIController26HandleIdleForegroundEventLEv @ 324 NONAME
-	_ZThn12_N18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 325 NONAME
-	_ZThn12_N18CPhoneUIController27HandlePhoneForegroundEventLEv @ 326 NONAME
-	_ZThn12_N18CPhoneUIControllerD0Ev @ 327 NONAME
-	_ZThn12_N18CPhoneUIControllerD1Ev @ 328 NONAME
-	_ZThn12_N19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 329 NONAME
-	_ZThn12_N19CPhoneStateIncomingD0Ev @ 330 NONAME
-	_ZThn12_N19CPhoneStateIncomingD1Ev @ 331 NONAME
-	_ZThn12_N20CPhoneStateCallSetupD0Ev @ 332 NONAME
-	_ZThn12_N20CPhoneStateCallSetupD1Ev @ 333 NONAME
-	_ZThn16_N11CPhoneState14HandleCommandLEi @ 334 NONAME
-	_ZThn16_N11CPhoneState15ProcessCommandLEi @ 335 NONAME
-	_ZThn16_N11CPhoneStateD0Ev @ 336 NONAME
-	_ZThn16_N11CPhoneStateD1Ev @ 337 NONAME
-	_ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 338 NONAME
-	_ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 339 NONAME
-	_ZThn16_N15CPhoneStateIdleD0Ev @ 340 NONAME
-	_ZThn16_N15CPhoneStateIdleD1Ev @ 341 NONAME
-	_ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 342 NONAME
-	_ZThn16_N17CPhoneStateInCallD0Ev @ 343 NONAME
-	_ZThn16_N17CPhoneStateInCallD1Ev @ 344 NONAME
-	_ZThn16_N18CPhoneStateStartupD0Ev @ 345 NONAME
-	_ZThn16_N18CPhoneStateStartupD1Ev @ 346 NONAME
-	_ZThn16_N18CPhoneUIController14HandleCommandLEi @ 347 NONAME
-	_ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 348 NONAME
-	_ZThn16_N18CPhoneUIControllerD0Ev @ 349 NONAME
-	_ZThn16_N18CPhoneUIControllerD1Ev @ 350 NONAME
-	_ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 351 NONAME
-	_ZThn16_N19CPhoneStateIncomingD0Ev @ 352 NONAME
-	_ZThn16_N19CPhoneStateIncomingD1Ev @ 353 NONAME
-	_ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 354 NONAME
-	_ZThn16_N20CPhoneStateCallSetupD0Ev @ 355 NONAME
-	_ZThn16_N20CPhoneStateCallSetupD1Ev @ 356 NONAME
-	_ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 357 NONAME
-	_ZThn20_N11CPhoneStateD0Ev @ 358 NONAME
-	_ZThn20_N11CPhoneStateD1Ev @ 359 NONAME
-	_ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 360 NONAME
-	_ZThn20_N15CPhoneStateIdleD0Ev @ 361 NONAME
-	_ZThn20_N15CPhoneStateIdleD1Ev @ 362 NONAME
-	_ZThn20_N17CPhoneStateInCallD0Ev @ 363 NONAME
-	_ZThn20_N17CPhoneStateInCallD1Ev @ 364 NONAME
-	_ZThn20_N18CPhoneStateStartupD0Ev @ 365 NONAME
-	_ZThn20_N18CPhoneStateStartupD1Ev @ 366 NONAME
-	_ZThn20_N19CPhoneStateIncomingD0Ev @ 367 NONAME
-	_ZThn20_N19CPhoneStateIncomingD1Ev @ 368 NONAME
-	_ZThn20_N20CPhoneStateCallSetupD0Ev @ 369 NONAME
-	_ZThn20_N20CPhoneStateCallSetupD1Ev @ 370 NONAME
-	_ZThn24_N11CPhoneState25HandleNumberEntryClearedLEv @ 371 NONAME
-	_ZThn24_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 372 NONAME
-	_ZThn24_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 373 NONAME
-	_ZThn24_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 374 NONAME
-	_ZThn24_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 375 NONAME
-	_ZThn28_N11CPhoneState23HandleNumberEntryEditedEv @ 376 NONAME
-	_ZThn28_N11CPhoneStateD0Ev @ 377 NONAME
-	_ZThn28_N11CPhoneStateD1Ev @ 378 NONAME
-	_ZThn28_N15CPhoneStateIdleD0Ev @ 379 NONAME
-	_ZThn28_N15CPhoneStateIdleD1Ev @ 380 NONAME
-	_ZThn28_N17CPhoneStateInCallD0Ev @ 381 NONAME
-	_ZThn28_N17CPhoneStateInCallD1Ev @ 382 NONAME
-	_ZThn28_N18CPhoneStateStartupD0Ev @ 383 NONAME
-	_ZThn28_N18CPhoneStateStartupD1Ev @ 384 NONAME
-	_ZThn28_N19CPhoneStateIncomingD0Ev @ 385 NONAME
-	_ZThn28_N19CPhoneStateIncomingD1Ev @ 386 NONAME
-	_ZThn28_N20CPhoneStateCallSetupD0Ev @ 387 NONAME
-	_ZThn28_N20CPhoneStateCallSetupD1Ev @ 388 NONAME
-	_ZThn32_NK11CPhoneState11IsKeyLockOnEv @ 389 NONAME
-	_ZThn32_NK11CPhoneState12IsAutoLockOnEv @ 390 NONAME
-	_ZThn36_N11CPhoneState11SetEikonEnvEP9CEikonEnv @ 391 NONAME
-	_ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 392 NONAME
-	_ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 393 NONAME
-	_ZThn4_N11CPhoneStateD0Ev @ 394 NONAME
-	_ZThn4_N11CPhoneStateD1Ev @ 395 NONAME
-	_ZThn4_N15CPhoneStateIdle12HandleErrorLERK12TPEErrorInfo @ 396 NONAME
-	_ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 397 NONAME
-	_ZThn4_N15CPhoneStateIdleD0Ev @ 398 NONAME
-	_ZThn4_N15CPhoneStateIdleD1Ev @ 399 NONAME
-	_ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 400 NONAME
-	_ZThn4_N17CPhoneStateInCallD0Ev @ 401 NONAME
-	_ZThn4_N17CPhoneStateInCallD1Ev @ 402 NONAME
-	_ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 403 NONAME
-	_ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 404 NONAME
-	_ZThn4_N18CPhoneStateMachine12SecurityModeEv @ 405 NONAME
-	_ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 406 NONAME
-	_ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 407 NONAME
-	_ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 408 NONAME
-	_ZThn4_N18CPhoneStateMachine22HandlePropertyChangedLERK4TUidji @ 409 NONAME
-	_ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 410 NONAME
-	_ZThn4_N18CPhoneStateMachine23SetSecurityModeObserverEP26MPhoneSecurityModeObserver @ 411 NONAME
-	_ZThn4_N18CPhoneStateMachine25HandlePhoneEngineMessageLEii @ 412 NONAME
-	_ZThn4_N18CPhoneStateMachine25SetSecurityMessageHandlerEP28MPhoneSecurityMessageHandler @ 413 NONAME
-	_ZThn4_N18CPhoneStateMachine5StateEv @ 414 NONAME
-	_ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 415 NONAME
-	_ZThn4_N18CPhoneStateMachineD0Ev @ 416 NONAME
-	_ZThn4_N18CPhoneStateMachineD1Ev @ 417 NONAME
-	_ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 418 NONAME
-	_ZThn4_N18CPhoneStateStartupD0Ev @ 419 NONAME
-	_ZThn4_N18CPhoneStateStartupD1Ev @ 420 NONAME
-	_ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 421 NONAME
-	_ZThn4_N18CPhoneUIController13HandleMessageEii @ 422 NONAME
-	_ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 423 NONAME
-	_ZThn4_N19CPhoneStateIncomingD0Ev @ 424 NONAME
-	_ZThn4_N19CPhoneStateIncomingD1Ev @ 425 NONAME
-	_ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 426 NONAME
-	_ZThn4_N20CPhoneStateCallSetupD0Ev @ 427 NONAME
-	_ZThn4_N20CPhoneStateCallSetupD1Ev @ 428 NONAME
-	_ZThn8_N11CPhoneState14IsNoteVisibleLEv @ 429 NONAME
-	_ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 430 NONAME
-	_ZThn8_N11CPhoneState15HandleLongHashLEv @ 431 NONAME
-	_ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 432 NONAME
-	_ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 433 NONAME
-	_ZThn8_N11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 434 NONAME
-	_ZThn8_N11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 435 NONAME
-	_ZThn8_N11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 436 NONAME
-	_ZThn8_N11CPhoneStateD0Ev @ 437 NONAME
-	_ZThn8_N11CPhoneStateD1Ev @ 438 NONAME
-	_ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 439 NONAME
-	_ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 440 NONAME
-	_ZThn8_N15CPhoneStateIdleD0Ev @ 441 NONAME
-	_ZThn8_N15CPhoneStateIdleD1Ev @ 442 NONAME
-	_ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 443 NONAME
-	_ZThn8_N17CPhoneStateInCallD0Ev @ 444 NONAME
-	_ZThn8_N17CPhoneStateInCallD1Ev @ 445 NONAME
-	_ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 446 NONAME
-	_ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 447 NONAME
-	_ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 448 NONAME
-	_ZThn8_N18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 449 NONAME
-	_ZThn8_N18CPhoneStateStartupD0Ev @ 450 NONAME
-	_ZThn8_N18CPhoneStateStartupD1Ev @ 451 NONAME
-	_ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 452 NONAME
-	_ZThn8_N18CPhoneUIControllerD0Ev @ 453 NONAME
-	_ZThn8_N18CPhoneUIControllerD1Ev @ 454 NONAME
-	_ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 455 NONAME
-	_ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 456 NONAME
-	_ZThn8_N19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 457 NONAME
-	_ZThn8_N19CPhoneStateIncomingD0Ev @ 458 NONAME
-	_ZThn8_N19CPhoneStateIncomingD1Ev @ 459 NONAME
-	_ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 460 NONAME
-	_ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 461 NONAME
-	_ZThn8_N20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 462 NONAME
-	_ZThn8_N20CPhoneStateCallSetupD0Ev @ 463 NONAME
-	_ZThn8_N20CPhoneStateCallSetupD1Ev @ 464 NONAME
-	_ZThn8_NK11CPhoneState17IsMenuBarVisibleLEv @ 465 NONAME
-	_ZN11CPhoneState37SetNeedToReturnToForegroundAppStatusLEi @ 466 NONAME
+	_ZN11CPhoneState11IsVideoCallEi @ 2 NONAME
+	_ZN11CPhoneState11SetEikonEnvEP9CEikonEnv @ 3 NONAME
+	_ZN11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 4 NONAME
+	_ZN11CPhoneState14BaseConstructLEv @ 5 NONAME
+	_ZN11CPhoneState14DialVoiceCallLEv @ 6 NONAME
+	_ZN11CPhoneState14HandleCommandLEi @ 7 NONAME
+	_ZN11CPhoneState14IsNoteVisibleLEv @ 8 NONAME
+	_ZN11CPhoneState14ShowTextQueryLEiiiP6TDes16i @ 9 NONAME
+	_ZN11CPhoneState15DisconnectCallLEv @ 10 NONAME
+	_ZN11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 11 NONAME
+	_ZN11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 12 NONAME
+	_ZN11CPhoneState15HandleLongHashLEv @ 13 NONAME
+	_ZN11CPhoneState15ProcessCommandLEi @ 14 NONAME
+	_ZN11CPhoneState15SetContextMenuLEi @ 15 NONAME
+	_ZN11CPhoneState16CallWaitingNoteLEi @ 16 NONAME
+	_ZN11CPhoneState16CloseDTMFEditorLEv @ 17 NONAME
+	_ZN11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 18 NONAME
+	_ZN11CPhoneState16SetDefaultFlagsLEv @ 19 NONAME
+	_ZN11CPhoneState17DisplayCallSetupLEi @ 20 NONAME
+	_ZN11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 21 NONAME
+	_ZN11CPhoneState17IsAnyQueryActiveLEv @ 22 NONAME
+	_ZN11CPhoneState17SetCallHeaderTypeEN14CBubbleManager19TPhoneCallTypeFlagsE @ 23 NONAME
+	_ZN11CPhoneState17SetHandsfreeModeLEi @ 24 NONAME
+	_ZN11CPhoneState17SetToolbarDimmingEi @ 25 NONAME
+	_ZN11CPhoneState18DisplayIdleScreenLEv @ 26 NONAME
+	_ZN11CPhoneState18GetRemoteInfoDataLEiR6TDes16 @ 27 NONAME
+	_ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 28 NONAME
+	_ZN11CPhoneState18HandleSystemEventLERK8TWsEvent @ 29 NONAME
+	_ZN11CPhoneState18IsNumberEntryUsedLEv @ 30 NONAME
+	_ZN11CPhoneState18TransitionHandlerLEv @ 31 NONAME
+	_ZN11CPhoneState19CompleteSatRequestLEi @ 32 NONAME
+	_ZN11CPhoneState19DialMultimediaCallLEv @ 33 NONAME
+	_ZN11CPhoneState19HandleCenRepChangeLERK4TUidj @ 34 NONAME
+	_ZN11CPhoneState19HandlePhoneStartupLEv @ 35 NONAME
+	_ZN11CPhoneState19SendGlobalInfoNoteLEi @ 36 NONAME
+	_ZN11CPhoneState19SetBTHandsfreeModeLEi @ 37 NONAME
+	_ZN11CPhoneState19SetTouchPaneButtonsEi @ 38 NONAME
+	_ZN11CPhoneState19SetTouchPaneVisibleEi @ 39 NONAME
+	_ZN11CPhoneState19ShowNumberBusyNoteLEv @ 40 NONAME
+	_ZN11CPhoneState20CallFromNumberEntryLEv @ 41 NONAME
+	_ZN11CPhoneState20DecreaseAudioVolumeLEv @ 42 NONAME
+	_ZN11CPhoneState20HandleDisconnectingLEi @ 43 NONAME
+	_ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 44 NONAME
+	_ZN11CPhoneState20IncreaseAudioVolumeLEv @ 45 NONAME
+	_ZN11CPhoneState20SendGlobalErrorNoteLEi @ 46 NONAME
+	_ZN11CPhoneState21IsNumberEntryVisibleLEv @ 47 NONAME
+	_ZN11CPhoneState21UpdateRemoteInfoDataLEi @ 48 NONAME
+	_ZN11CPhoneState22CloseCustomizedDialerLEv @ 49 NONAME
+	_ZN11CPhoneState22DeleteTouchPaneButtonsEv @ 50 NONAME
+	_ZN11CPhoneState22HandleForegroundEventLEi @ 51 NONAME
+	_ZN11CPhoneState22HandleNumericKeyEventLERK9TKeyEvent10TEventCode @ 52 NONAME
+	_ZN11CPhoneState22HandlePropertyChangedLERK4TUidji @ 53 NONAME
+	_ZN11CPhoneState22OnlyHashInNumberEntryLEv @ 54 NONAME
+	_ZN11CPhoneState22PhoneNumberFromEntryLCEv @ 55 NONAME
+	_ZN11CPhoneState22SendGlobalWarningNoteLEi @ 56 NONAME
+	_ZN11CPhoneState22StartShowSecurityNoteLEv @ 57 NONAME
+	_ZN11CPhoneState23HandleAudioMuteChangedLEv @ 58 NONAME
+	_ZN11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 59 NONAME
+	_ZN11CPhoneState23HandleNumberEntryEditedEv @ 60 NONAME
+	_ZN11CPhoneState23SetRingingTonePlaybackLEi @ 61 NONAME
+	_ZN11CPhoneState23UpdateSingleActiveCallLEi @ 62 NONAME
+	_ZN11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 63 NONAME
+	_ZN11CPhoneState24HandleEnvironmentChangeLEi @ 64 NONAME
+	_ZN11CPhoneState24StartAlsLineChangeTimerLEv @ 65 NONAME
+	_ZN11CPhoneState24StoreNumberEntryContentLEv @ 66 NONAME
+	_ZN11CPhoneState24UpdateInCallContextMenuLEv @ 67 NONAME
+	_ZN11CPhoneState25HandleAudioOutputChangedLEv @ 68 NONAME
+	_ZN11CPhoneState25HandleNumberEntryClearedLEv @ 69 NONAME
+	_ZN11CPhoneState25HandlePhoneEngineMessageLEii @ 70 NONAME
+	_ZN11CPhoneState25SetNumberEntryVisibilityLEi @ 71 NONAME
+	_ZN11CPhoneState25SetTouchPaneButtonEnabledEi @ 72 NONAME
+	_ZN11CPhoneState26HandleIdleForegroundEventLEv @ 73 NONAME
+	_ZN11CPhoneState26HandlePhoneFocusLostEventLEv @ 74 NONAME
+	_ZN11CPhoneState26IsNumberEntryContentStoredEv @ 75 NONAME
+	_ZN11CPhoneState26RestoreNumberEntryContentLEv @ 76 NONAME
+	_ZN11CPhoneState26SetTouchPaneButtonDisabledEi @ 77 NONAME
+	_ZN11CPhoneState26UpdateIncomingContextMenuLEi @ 78 NONAME
+	_ZN11CPhoneState26UpdateSilenceButtonDimmingEv @ 79 NONAME
+	_ZN11CPhoneState27DisplayCallTerminationNoteLEv @ 80 NONAME
+	_ZN11CPhoneState27HandlePhoneForegroundEventLEv @ 81 NONAME
+	_ZN11CPhoneState27SetToolbarButtonBTHFEnabledEv @ 82 NONAME
+	_ZN11CPhoneState28ClearNumberEntryContentCacheEv @ 83 NONAME
+	_ZN11CPhoneState28SetupIdleScreenInBackgroundLEv @ 84 NONAME
+	_ZN11CPhoneState29DisplayHeaderForCallComingInLEii @ 85 NONAME
+	_ZN11CPhoneState29DisplayHeaderForOutgoingCallLEi @ 86 NONAME
+	_ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 87 NONAME
+	_ZN11CPhoneState30CustomizedDialerCbaResourceIdLEv @ 88 NONAME
+	_ZN11CPhoneState30SetToolbarButtonHandsetEnabledEv @ 89 NONAME
+	_ZN11CPhoneState31CustomizedDialerMenuResourceIdLEv @ 90 NONAME
+	_ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 91 NONAME
+	_ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 92 NONAME
+	_ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 93 NONAME
+	_ZN11CPhoneState35CloseClearNumberEntryAndLoadEffectLE21TPhoneTransEffectType @ 94 NONAME
+	_ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 95 NONAME
+	_ZN11CPhoneState36DoStateSpecificCallSetUpDefinitionsLEv @ 96 NONAME
+	_ZN11CPhoneState37ForwardPEMessageToPhoneCustomizationLEii @ 97 NONAME
+	_ZN11CPhoneState37SetNeedToReturnToForegroundAppStatusLEi @ 98 NONAME
+	_ZN11CPhoneState38CheckIfRestoreNEContentAfterDtmfDialerEv @ 99 NONAME
+	_ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 100 NONAME
+	_ZN11CPhoneState7IsSimOkEv @ 101 NONAME
+	_ZN11CPhoneState9ShowNoteLEi @ 102 NONAME
+	_ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 103 NONAME
+	_ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 104 NONAME
+	_ZN11CPhoneStateD0Ev @ 105 NONAME
+	_ZN11CPhoneStateD1Ev @ 106 NONAME
+	_ZN11CPhoneStateD2Ev @ 107 NONAME
+	_ZN15CPhoneStateIdle10ConstructLEv @ 108 NONAME
+	_ZN15CPhoneStateIdle10SpeedDialLERKjNS_21TDialInitiationMethodE @ 109 NONAME
+	_ZN15CPhoneStateIdle12HandleErrorLERK12TPEErrorInfo @ 110 NONAME
+	_ZN15CPhoneStateIdle14DialVoiceCallLEv @ 111 NONAME
+	_ZN15CPhoneStateIdle14HandleCommandLEi @ 112 NONAME
+	_ZN15CPhoneStateIdle14HandleDialingLEi @ 113 NONAME
+	_ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 114 NONAME
+	_ZN15CPhoneStateIdle15ProcessCommandLEi @ 115 NONAME
+	_ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 116 NONAME
+	_ZN15CPhoneStateIdle18HandleSendCommandLEv @ 117 NONAME
+	_ZN15CPhoneStateIdle18SpeedDialCanceledLERKj @ 118 NONAME
+	_ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 119 NONAME
+	_ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 120 NONAME
+	_ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 121 NONAME
+	_ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 122 NONAME
+	_ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 123 NONAME
+	_ZN15CPhoneStateIdle25HandleNumberLongKeyPressLEv @ 124 NONAME
+	_ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 125 NONAME
+	_ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 126 NONAME
+	_ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 127 NONAME
+	_ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 128 NONAME
+	_ZN15CPhoneStateIdle36DoStateSpecificCallSetUpDefinitionsLEv @ 129 NONAME
+	_ZN15CPhoneStateIdle5DialLERK7TDesC1616TPhoneNumberTypeNS_21TDialInitiationMethodE @ 130 NONAME
+	_ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 131 NONAME
+	_ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 132 NONAME
+	_ZN15CPhoneStateIdleD0Ev @ 133 NONAME
+	_ZN15CPhoneStateIdleD1Ev @ 134 NONAME
+	_ZN15CPhoneStateIdleD2Ev @ 135 NONAME
+	_ZN16CPhoneCbaManager10UpdateCbaLEi @ 136 NONAME
+	_ZN16CPhoneCbaManager18UpdateIncomingCbaLEi @ 137 NONAME
+	_ZN16CPhoneCbaManager7SetCbaLEi @ 138 NONAME
+	_ZN17CPhoneStateHandle17ViewCommandHandleEv @ 139 NONAME
+	_ZN17CPhoneStateHandle8InstanceEv @ 140 NONAME
+	_ZN17CPhoneStateInCall10ConstructLEv @ 141 NONAME
+	_ZN17CPhoneStateInCall10UpdateCbaLEi @ 142 NONAME
+	_ZN17CPhoneStateInCall11HandleIdleLEi @ 143 NONAME
+	_ZN17CPhoneStateInCall12OpenMenuBarLEv @ 144 NONAME
+	_ZN17CPhoneStateInCall14HandleCommandLEi @ 145 NONAME
+	_ZN17CPhoneStateInCall15CloseDtmfQueryLEv @ 146 NONAME
+	_ZN17CPhoneStateInCall15GetRingingCallLEv @ 147 NONAME
+	_ZN17CPhoneStateInCall16UpdateInCallCbaLEv @ 148 NONAME
+	_ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 149 NONAME
+	_ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 150 NONAME
+	_ZN17CPhoneStateInCall18CreateNumberEntryLEv @ 151 NONAME
+	_ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 152 NONAME
+	_ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 153 NONAME
+	_ZN17CPhoneStateInCall19LaunchNewCallQueryLEv @ 154 NONAME
+	_ZN17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 155 NONAME
+	_ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 156 NONAME
+	_ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 157 NONAME
+	_ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 158 NONAME
+	_ZN17CPhoneStateInCall34PhoneNumberAvailableInPhoneEngineLEi @ 159 NONAME
+	_ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 160 NONAME
+	_ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 161 NONAME
+	_ZN17CPhoneStateInCallD0Ev @ 162 NONAME
+	_ZN17CPhoneStateInCallD1Ev @ 163 NONAME
+	_ZN17CPhoneStateInCallD2Ev @ 164 NONAME
+	_ZN18CPhoneStateMachine11ChangeStateEi @ 165 NONAME
+	_ZN18CPhoneStateMachine11PhoneEngineEv @ 166 NONAME
+	_ZN18CPhoneStateMachine12SecurityModeEv @ 167 NONAME
+	_ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 168 NONAME
+	_ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 169 NONAME
+	_ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 170 NONAME
+	_ZN18CPhoneStateMachine22HandlePropertyChangedLERK4TUidji @ 171 NONAME
+	_ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 172 NONAME
+	_ZN18CPhoneStateMachine23SetSecurityModeObserverEP26MPhoneSecurityModeObserver @ 173 NONAME
+	_ZN18CPhoneStateMachine25HandlePhoneEngineMessageLEii @ 174 NONAME
+	_ZN18CPhoneStateMachine25SetSecurityMessageHandlerEP28MPhoneSecurityMessageHandler @ 175 NONAME
+	_ZN18CPhoneStateMachine5StateEv @ 176 NONAME
+	_ZN18CPhoneStateMachine9SetCallIdEi @ 177 NONAME
+	_ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 178 NONAME
+	_ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 179 NONAME
+	_ZN18CPhoneStateMachineD0Ev @ 180 NONAME
+	_ZN18CPhoneStateMachineD1Ev @ 181 NONAME
+	_ZN18CPhoneStateMachineD2Ev @ 182 NONAME
+	_ZN18CPhoneStateStartup10ConstructLEv @ 183 NONAME
+	_ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 184 NONAME
+	_ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 185 NONAME
+	_ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 186 NONAME
+	_ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 187 NONAME
+	_ZN18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 188 NONAME
+	_ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 189 NONAME
+	_ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 190 NONAME
+	_ZN18CPhoneStateStartup26HandlePEConstructionReadyLEi @ 191 NONAME
+	_ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 192 NONAME
+	_ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 193 NONAME
+	_ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 194 NONAME
+	_ZN18CPhoneStateStartupD0Ev @ 195 NONAME
+	_ZN18CPhoneStateStartupD1Ev @ 196 NONAME
+	_ZN18CPhoneStateStartupD2Ev @ 197 NONAME
+	_ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 198 NONAME
+	_ZN18CPhoneUIController13HandleMessageEii @ 199 NONAME
+	_ZN18CPhoneUIController14HandleCommandLEi @ 200 NONAME
+	_ZN18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 201 NONAME
+	_ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 202 NONAME
+	_ZN18CPhoneUIController15ProcessCommandLEi @ 203 NONAME
+	_ZN18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 204 NONAME
+	_ZN18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 205 NONAME
+	_ZN18CPhoneUIController19HandlePhoneStartupLEv @ 206 NONAME
+	_ZN18CPhoneUIController22HandleForegroundEventLEi @ 207 NONAME
+	_ZN18CPhoneUIController24HandleEnvironmentChangeLEi @ 208 NONAME
+	_ZN18CPhoneUIController26HandleIdleForegroundEventLEv @ 209 NONAME
+	_ZN18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 210 NONAME
+	_ZN18CPhoneUIController27HandlePhoneForegroundEventLEv @ 211 NONAME
+	_ZN18CPhoneUIController4NewLER20CPhoneViewController @ 212 NONAME
+	_ZN18CPhoneUIControllerD0Ev @ 213 NONAME
+	_ZN18CPhoneUIControllerD1Ev @ 214 NONAME
+	_ZN18CPhoneUIControllerD2Ev @ 215 NONAME
+	_ZN19CPhoneStateIncoming10ConstructLEv @ 216 NONAME
+	_ZN19CPhoneStateIncoming14HandleCommandLEi @ 217 NONAME
+	_ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 218 NONAME
+	_ZN19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 219 NONAME
+	_ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 220 NONAME
+	_ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 221 NONAME
+	_ZN19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 222 NONAME
+	_ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 223 NONAME
+	_ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 224 NONAME
+	_ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 225 NONAME
+	_ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 226 NONAME
+	_ZN19CPhoneStateIncomingD0Ev @ 227 NONAME
+	_ZN19CPhoneStateIncomingD1Ev @ 228 NONAME
+	_ZN19CPhoneStateIncomingD2Ev @ 229 NONAME
+	_ZN20CPhoneReconnectQuery19ShowReconnectQueryLEi @ 230 NONAME
+	_ZN20CPhoneReconnectQuery9InstanceLEv @ 231 NONAME
+	_ZN20CPhoneStateCallSetup10ConstructLEv @ 232 NONAME
+	_ZN20CPhoneStateCallSetup10UpdateCbaLEi @ 233 NONAME
+	_ZN20CPhoneStateCallSetup12OpenMenuBarLEv @ 234 NONAME
+	_ZN20CPhoneStateCallSetup14HandleCommandLEi @ 235 NONAME
+	_ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 236 NONAME
+	_ZN20CPhoneStateCallSetup16UpdateInCallCbaLEv @ 237 NONAME
+	_ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 238 NONAME
+	_ZN20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 239 NONAME
+	_ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 240 NONAME
+	_ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 241 NONAME
+	_ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 242 NONAME
+	_ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 243 NONAME
+	_ZN20CPhoneStateCallSetupD0Ev @ 244 NONAME
+	_ZN20CPhoneStateCallSetupD1Ev @ 245 NONAME
+	_ZN20CPhoneStateCallSetupD2Ev @ 246 NONAME
+	_ZN23TPhoneTransitionHandler11EndUiUpdateEv @ 247 NONAME
+	_ZN23TPhoneTransitionHandler14EndTransEffectEv @ 248 NONAME
+	_ZN23TPhoneTransitionHandler15BeginUiUpdateLCEv @ 249 NONAME
+	_ZN23TPhoneTransitionHandler18BeginTransEffectLCE21TPhoneTransEffectType @ 250 NONAME
+	_ZN23TPhoneTransitionHandler18IdleCallUiUpdateLCEv @ 251 NONAME
+	_ZN23TPhoneTransitionHandler20EndUiUpdateAndEffectEv @ 252 NONAME
+	_ZN23TPhoneTransitionHandler22IncomingCallUiUpdateLCEv @ 253 NONAME
+	_ZNK11CPhoneState11IsKeyLockOnEv @ 254 NONAME
+	_ZNK11CPhoneState12IsAutoLockOnEv @ 255 NONAME
+	_ZNK11CPhoneState14IsSwivelClosedEv @ 256 NONAME
+	_ZNK11CPhoneState17IsMenuBarVisibleLEv @ 257 NONAME
+	_ZNK11CPhoneState18TopAppIsDisplayedLEv @ 258 NONAME
+	_ZNK11CPhoneState20IsDTMFEditorVisibleLEv @ 259 NONAME
+	_ZNK11CPhoneState25IsOnScreenDialerSupportedEv @ 260 NONAME
+	_ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 261 NONAME
+	_ZNK11CPhoneState26IsDialingExtensionInFocusLEv @ 262 NONAME
+	_ZNK11CPhoneState28NeedToReturnToForegroundAppLEv @ 263 NONAME
+	_ZNK11CPhoneState8EikonEnvEv @ 264 NONAME
+	_ZNK11CPhoneState8SimStateEv @ 265 NONAME
+	_ZNK15CPhoneStateIdle17IsSpeedDialNumberERK7TDesC16 @ 266 NONAME
+	_ZNK18CPhoneStateMachine8EikonEnvEv @ 267 NONAME
+	_ZTI11CPhoneState @ 268 NONAME
+	_ZTI15CPhoneStateIdle @ 269 NONAME
+	_ZTI17CPhoneStateHandle @ 270 NONAME
+	_ZTI17CPhoneStateInCall @ 271 NONAME
+	_ZTI18CPhoneStateMachine @ 272 NONAME
+	_ZTI18CPhoneStateStartup @ 273 NONAME
+	_ZTI18CPhoneUIController @ 274 NONAME
+	_ZTI19CPhoneStateIncoming @ 275 NONAME
+	_ZTI20CPhoneReconnectQuery @ 276 NONAME
+	_ZTI20CPhoneStateCallSetup @ 277 NONAME
+	_ZTI23CPhoneDtmfWaitCharTimer @ 278 NONAME
+	_ZTI23CPhoneKeyEventForwarder @ 279 NONAME
+	_ZTI24CPhoneSystemEventHandler @ 280 NONAME
+	_ZTI26CPhoneRemoteControlHandler @ 281 NONAME
+	_ZTI27CPhoneBtaaDisconnectHandler @ 282 NONAME
+	_ZTV11CPhoneState @ 283 NONAME
+	_ZTV15CPhoneStateIdle @ 284 NONAME
+	_ZTV17CPhoneStateHandle @ 285 NONAME
+	_ZTV17CPhoneStateInCall @ 286 NONAME
+	_ZTV18CPhoneStateMachine @ 287 NONAME
+	_ZTV18CPhoneStateStartup @ 288 NONAME
+	_ZTV18CPhoneUIController @ 289 NONAME
+	_ZTV19CPhoneStateIncoming @ 290 NONAME
+	_ZTV20CPhoneReconnectQuery @ 291 NONAME
+	_ZTV20CPhoneStateCallSetup @ 292 NONAME
+	_ZTV23CPhoneDtmfWaitCharTimer @ 293 NONAME
+	_ZTV23CPhoneKeyEventForwarder @ 294 NONAME
+	_ZTV24CPhoneSystemEventHandler @ 295 NONAME
+	_ZTV26CPhoneRemoteControlHandler @ 296 NONAME
+	_ZTV27CPhoneBtaaDisconnectHandler @ 297 NONAME
+	_ZThn12_N11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 298 NONAME
+	_ZThn12_N11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 299 NONAME
+	_ZThn12_N11CPhoneState18HandleSystemEventLERK8TWsEvent @ 300 NONAME
+	_ZThn12_N11CPhoneState19HandleCenRepChangeLERK4TUidj @ 301 NONAME
+	_ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 302 NONAME
+	_ZThn12_N11CPhoneState22HandleForegroundEventLEi @ 303 NONAME
+	_ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 304 NONAME
+	_ZThn12_N11CPhoneState24HandleEnvironmentChangeLEi @ 305 NONAME
+	_ZThn12_N11CPhoneState26HandleIdleForegroundEventLEv @ 306 NONAME
+	_ZThn12_N11CPhoneState26HandlePhoneFocusLostEventLEv @ 307 NONAME
+	_ZThn12_N11CPhoneState27HandlePhoneForegroundEventLEv @ 308 NONAME
+	_ZThn12_N11CPhoneStateD0Ev @ 309 NONAME
+	_ZThn12_N11CPhoneStateD1Ev @ 310 NONAME
+	_ZThn12_N15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 311 NONAME
+	_ZThn12_N15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 312 NONAME
+	_ZThn12_N15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 313 NONAME
+	_ZThn12_N15CPhoneStateIdleD0Ev @ 314 NONAME
+	_ZThn12_N15CPhoneStateIdleD1Ev @ 315 NONAME
+	_ZThn12_N17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 316 NONAME
+	_ZThn12_N17CPhoneStateInCallD0Ev @ 317 NONAME
+	_ZThn12_N17CPhoneStateInCallD1Ev @ 318 NONAME
+	_ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 319 NONAME
+	_ZThn12_N18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 320 NONAME
+	_ZThn12_N18CPhoneStateStartupD0Ev @ 321 NONAME
+	_ZThn12_N18CPhoneStateStartupD1Ev @ 322 NONAME
+	_ZThn12_N18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 323 NONAME
+	_ZThn12_N18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 324 NONAME
+	_ZThn12_N18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 325 NONAME
+	_ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 326 NONAME
+	_ZThn12_N18CPhoneUIController22HandleForegroundEventLEi @ 327 NONAME
+	_ZThn12_N18CPhoneUIController24HandleEnvironmentChangeLEi @ 328 NONAME
+	_ZThn12_N18CPhoneUIController26HandleIdleForegroundEventLEv @ 329 NONAME
+	_ZThn12_N18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 330 NONAME
+	_ZThn12_N18CPhoneUIController27HandlePhoneForegroundEventLEv @ 331 NONAME
+	_ZThn12_N18CPhoneUIControllerD0Ev @ 332 NONAME
+	_ZThn12_N18CPhoneUIControllerD1Ev @ 333 NONAME
+	_ZThn12_N19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 334 NONAME
+	_ZThn12_N19CPhoneStateIncomingD0Ev @ 335 NONAME
+	_ZThn12_N19CPhoneStateIncomingD1Ev @ 336 NONAME
+	_ZThn12_N20CPhoneStateCallSetupD0Ev @ 337 NONAME
+	_ZThn12_N20CPhoneStateCallSetupD1Ev @ 338 NONAME
+	_ZThn16_N11CPhoneState14HandleCommandLEi @ 339 NONAME
+	_ZThn16_N11CPhoneState15ProcessCommandLEi @ 340 NONAME
+	_ZThn16_N11CPhoneStateD0Ev @ 341 NONAME
+	_ZThn16_N11CPhoneStateD1Ev @ 342 NONAME
+	_ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 343 NONAME
+	_ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 344 NONAME
+	_ZThn16_N15CPhoneStateIdleD0Ev @ 345 NONAME
+	_ZThn16_N15CPhoneStateIdleD1Ev @ 346 NONAME
+	_ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 347 NONAME
+	_ZThn16_N17CPhoneStateInCallD0Ev @ 348 NONAME
+	_ZThn16_N17CPhoneStateInCallD1Ev @ 349 NONAME
+	_ZThn16_N18CPhoneStateStartupD0Ev @ 350 NONAME
+	_ZThn16_N18CPhoneStateStartupD1Ev @ 351 NONAME
+	_ZThn16_N18CPhoneUIController14HandleCommandLEi @ 352 NONAME
+	_ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 353 NONAME
+	_ZThn16_N18CPhoneUIControllerD0Ev @ 354 NONAME
+	_ZThn16_N18CPhoneUIControllerD1Ev @ 355 NONAME
+	_ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 356 NONAME
+	_ZThn16_N19CPhoneStateIncomingD0Ev @ 357 NONAME
+	_ZThn16_N19CPhoneStateIncomingD1Ev @ 358 NONAME
+	_ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 359 NONAME
+	_ZThn16_N20CPhoneStateCallSetupD0Ev @ 360 NONAME
+	_ZThn16_N20CPhoneStateCallSetupD1Ev @ 361 NONAME
+	_ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 362 NONAME
+	_ZThn20_N11CPhoneStateD0Ev @ 363 NONAME
+	_ZThn20_N11CPhoneStateD1Ev @ 364 NONAME
+	_ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 365 NONAME
+	_ZThn20_N15CPhoneStateIdleD0Ev @ 366 NONAME
+	_ZThn20_N15CPhoneStateIdleD1Ev @ 367 NONAME
+	_ZThn20_N17CPhoneStateInCallD0Ev @ 368 NONAME
+	_ZThn20_N17CPhoneStateInCallD1Ev @ 369 NONAME
+	_ZThn20_N18CPhoneStateStartupD0Ev @ 370 NONAME
+	_ZThn20_N18CPhoneStateStartupD1Ev @ 371 NONAME
+	_ZThn20_N19CPhoneStateIncomingD0Ev @ 372 NONAME
+	_ZThn20_N19CPhoneStateIncomingD1Ev @ 373 NONAME
+	_ZThn20_N20CPhoneStateCallSetupD0Ev @ 374 NONAME
+	_ZThn20_N20CPhoneStateCallSetupD1Ev @ 375 NONAME
+	_ZThn24_N11CPhoneState25HandleNumberEntryClearedLEv @ 376 NONAME
+	_ZThn24_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 377 NONAME
+	_ZThn24_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 378 NONAME
+	_ZThn24_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 379 NONAME
+	_ZThn24_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 380 NONAME
+	_ZThn28_N11CPhoneState23HandleNumberEntryEditedEv @ 381 NONAME
+	_ZThn28_N11CPhoneStateD0Ev @ 382 NONAME
+	_ZThn28_N11CPhoneStateD1Ev @ 383 NONAME
+	_ZThn28_N15CPhoneStateIdleD0Ev @ 384 NONAME
+	_ZThn28_N15CPhoneStateIdleD1Ev @ 385 NONAME
+	_ZThn28_N17CPhoneStateInCallD0Ev @ 386 NONAME
+	_ZThn28_N17CPhoneStateInCallD1Ev @ 387 NONAME
+	_ZThn28_N18CPhoneStateStartupD0Ev @ 388 NONAME
+	_ZThn28_N18CPhoneStateStartupD1Ev @ 389 NONAME
+	_ZThn28_N19CPhoneStateIncomingD0Ev @ 390 NONAME
+	_ZThn28_N19CPhoneStateIncomingD1Ev @ 391 NONAME
+	_ZThn28_N20CPhoneStateCallSetupD0Ev @ 392 NONAME
+	_ZThn28_N20CPhoneStateCallSetupD1Ev @ 393 NONAME
+	_ZThn32_NK11CPhoneState11IsKeyLockOnEv @ 394 NONAME
+	_ZThn32_NK11CPhoneState12IsAutoLockOnEv @ 395 NONAME
+	_ZThn36_N11CPhoneState11SetEikonEnvEP9CEikonEnv @ 396 NONAME
+	_ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 397 NONAME
+	_ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 398 NONAME
+	_ZThn4_N11CPhoneStateD0Ev @ 399 NONAME
+	_ZThn4_N11CPhoneStateD1Ev @ 400 NONAME
+	_ZThn4_N15CPhoneStateIdle12HandleErrorLERK12TPEErrorInfo @ 401 NONAME
+	_ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 402 NONAME
+	_ZThn4_N15CPhoneStateIdleD0Ev @ 403 NONAME
+	_ZThn4_N15CPhoneStateIdleD1Ev @ 404 NONAME
+	_ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 405 NONAME
+	_ZThn4_N17CPhoneStateInCallD0Ev @ 406 NONAME
+	_ZThn4_N17CPhoneStateInCallD1Ev @ 407 NONAME
+	_ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 408 NONAME
+	_ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 409 NONAME
+	_ZThn4_N18CPhoneStateMachine12SecurityModeEv @ 410 NONAME
+	_ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 411 NONAME
+	_ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 412 NONAME
+	_ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 413 NONAME
+	_ZThn4_N18CPhoneStateMachine22HandlePropertyChangedLERK4TUidji @ 414 NONAME
+	_ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 415 NONAME
+	_ZThn4_N18CPhoneStateMachine23SetSecurityModeObserverEP26MPhoneSecurityModeObserver @ 416 NONAME
+	_ZThn4_N18CPhoneStateMachine25HandlePhoneEngineMessageLEii @ 417 NONAME
+	_ZThn4_N18CPhoneStateMachine25SetSecurityMessageHandlerEP28MPhoneSecurityMessageHandler @ 418 NONAME
+	_ZThn4_N18CPhoneStateMachine5StateEv @ 419 NONAME
+	_ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 420 NONAME
+	_ZThn4_N18CPhoneStateMachineD0Ev @ 421 NONAME
+	_ZThn4_N18CPhoneStateMachineD1Ev @ 422 NONAME
+	_ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 423 NONAME
+	_ZThn4_N18CPhoneStateStartupD0Ev @ 424 NONAME
+	_ZThn4_N18CPhoneStateStartupD1Ev @ 425 NONAME
+	_ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 426 NONAME
+	_ZThn4_N18CPhoneUIController13HandleMessageEii @ 427 NONAME
+	_ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 428 NONAME
+	_ZThn4_N19CPhoneStateIncomingD0Ev @ 429 NONAME
+	_ZThn4_N19CPhoneStateIncomingD1Ev @ 430 NONAME
+	_ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 431 NONAME
+	_ZThn4_N20CPhoneStateCallSetupD0Ev @ 432 NONAME
+	_ZThn4_N20CPhoneStateCallSetupD1Ev @ 433 NONAME
+	_ZThn8_N11CPhoneState14IsNoteVisibleLEv @ 434 NONAME
+	_ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 435 NONAME
+	_ZThn8_N11CPhoneState15HandleLongHashLEv @ 436 NONAME
+	_ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 437 NONAME
+	_ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 438 NONAME
+	_ZThn8_N11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 439 NONAME
+	_ZThn8_N11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 440 NONAME
+	_ZThn8_N11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 441 NONAME
+	_ZThn8_N11CPhoneStateD0Ev @ 442 NONAME
+	_ZThn8_N11CPhoneStateD1Ev @ 443 NONAME
+	_ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 444 NONAME
+	_ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 445 NONAME
+	_ZThn8_N15CPhoneStateIdleD0Ev @ 446 NONAME
+	_ZThn8_N15CPhoneStateIdleD1Ev @ 447 NONAME
+	_ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 448 NONAME
+	_ZThn8_N17CPhoneStateInCallD0Ev @ 449 NONAME
+	_ZThn8_N17CPhoneStateInCallD1Ev @ 450 NONAME
+	_ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 451 NONAME
+	_ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 452 NONAME
+	_ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 453 NONAME
+	_ZThn8_N18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 454 NONAME
+	_ZThn8_N18CPhoneStateStartupD0Ev @ 455 NONAME
+	_ZThn8_N18CPhoneStateStartupD1Ev @ 456 NONAME
+	_ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 457 NONAME
+	_ZThn8_N18CPhoneUIControllerD0Ev @ 458 NONAME
+	_ZThn8_N18CPhoneUIControllerD1Ev @ 459 NONAME
+	_ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 460 NONAME
+	_ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 461 NONAME
+	_ZThn8_N19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 462 NONAME
+	_ZThn8_N19CPhoneStateIncomingD0Ev @ 463 NONAME
+	_ZThn8_N19CPhoneStateIncomingD1Ev @ 464 NONAME
+	_ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 465 NONAME
+	_ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 466 NONAME
+	_ZThn8_N20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 467 NONAME
+	_ZThn8_N20CPhoneStateCallSetupD0Ev @ 468 NONAME
+	_ZThn8_N20CPhoneStateCallSetupD1Ev @ 469 NONAME
+	_ZThn8_NK11CPhoneState17IsMenuBarVisibleLEv @ 470 NONAME
 
--- a/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp	Tue Sep 14 21:18:17 2010 +0300
@@ -54,6 +54,7 @@
 SOURCE          cphonenumberentrymanager.cpp
 SOURCE          cphonecbamanager.cpp
 SOURCE          cphonesecuritymodeobserver.cpp
+SOURCE          tphonetransitionhandler.cpp
 
 /* Languages */
 LANG SC
--- a/phoneapp/phoneuicontrol/inc/cphonestate.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/inc/cphonestate.h	Tue Sep 14 21:18:17 2010 +0300
@@ -30,30 +30,19 @@
 #include "mphonestate.h"
 #include "mphoneviewcommandhandle.h"
 #include "cphonecbamanager.h"
+#include "tphonecmdparamtranseffect.h"
+#include "tphonetransitionhandler.h"
 
 // FORWARD DECLARATIONS
 class MPhoneState;
 class MPhoneStateMachine;
 class CPhoneCallHeaderManager;
+class TPhoneTransitionHandler;
 class CPhoneTimer;
 class TPhoneCmdParamCallHeaderData;
 class MPhoneCustomization;
 class CPhoneNumberEntryManager;
 
-enum TStateTransEffectType
-    {
-    ENoneType,
-    ECallUiAppear,
-    ECallUiDisappear,
-    // These effect types can be used only when NE is opened/closed
-    // when some other app than phone is visible on the foreground/
-    // background.
-    // These cannot be used for internal transitions (=call ui<->dialer).
-    ENumberEntryOpen,
-    ENumberEntryClose,
-    ENumberEntryCreate
-    };
-
 // CLASS DECLARATION
 
 /**
@@ -238,20 +227,6 @@
         * Handles Long hash key press
         */
         IMPORT_C void HandleLongHashL();
-
-        /**
-        * Informs view to start Transition effect if effect
-        * type is feasible for current state.
-        * @param aType a transition effect, default none
-        * EndTransEffect() must be called when update is done.
-        */
-        IMPORT_C void BeginTransEffectLC( TStateTransEffectType aType = ENoneType );
-
-        /**
-        * Informs view to complete Transition effect
-        */
-        IMPORT_C void EndTransEffect();
-
         /**
         * Checks whether customized dialer view is active,
         * @return ETrue if customized dialer is active
@@ -348,6 +323,12 @@
         * @param CEikonEnv handle
         */
         IMPORT_C virtual void SetEikonEnv( CEikonEnv* aEnv );
+		
+        /**
+        * Getter for TPhoneTransitionHandler instance.
+        * @return TPhoneTransitionHandler handle
+        */    
+        IMPORT_C TPhoneTransitionHandler& TransitionHandlerL();
 
     public: // NumberEntry functions.
 
@@ -372,7 +353,7 @@
         /**
         * Close and and clear number entry.
         */
-        IMPORT_C void CloseClearNumberEntryAndLoadEffectL( TStateTransEffectType aType );
+        IMPORT_C void CloseClearNumberEntryAndLoadEffectL( TPhoneTransEffectType aType );
 
     protected:
 
@@ -636,18 +617,7 @@
         * in number entry.
         */
         IMPORT_C virtual void OnlyHashInNumberEntryL();
-
-        /**
-        * Informs view that UI is being updated (call bubble or number editor).
-        * EndUiUpdate() must be called when update is done.
-        */
-        IMPORT_C void BeginUiUpdateLC();
-
-        /**
-        * Informs view that UI update is completed.
-        */
-        IMPORT_C void EndUiUpdate();
-
+        
         /*
         * Checks if necessary to show call termination note
         *
@@ -1030,18 +1000,6 @@
             TPhoneCmdParamCallHeaderData* aCallHeaderData );
 
         /**
-        * TCleanupOperation to call EndUiUpdate(), if leave occurs
-        * after BeginUiUpdate().
-        */
-        static void UiUpdateCleanup(TAny* aThis );
-
-        /**
-        * TCleanupOperation to call EndTransEffect, if leave occurs
-        * after BeginTransEffect().
-        */
-        static void EffectCleanup(TAny* aThis );
-
-        /**
         * Gets volume level from ui control.
         */
         TInt GetVolumeLevel();
@@ -1094,7 +1052,7 @@
          */
         void SendDtmfKeyEventL( const TKeyEvent& aKeyEvent,
                 TEventCode aEventCode  );
-
+        
         /*
          * Creates call header manager if needed.
         */
@@ -1193,6 +1151,9 @@
 
         // Call header manager.
         CPhoneCallHeaderManager* iCallHeaderManager;
+        
+        // Call header manager.
+        TPhoneTransitionHandler* iTransitionHandler;
 
         // Number entry manager
         CPhoneNumberEntryManager* iNumberEntryManager;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuicontrol/inc/tphonetransitionhandler.h	Tue Sep 14 21:18:17 2010 +0300
@@ -0,0 +1,108 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Class handles phoneapp internal/external transitions.
+*
+*/
+
+
+#ifndef TPHONETRANSITIONHANDLER_H
+#define TPHONETRANSITIONHANDLER_H
+
+//INCLUDES
+#include <e32base.h>
+#include "mphoneviewcommandhandle.h"
+#include "tphonecmdparamtranseffect.h"
+
+class CPhoneState;
+
+/**
+ * Class handles phoneapp internal/external transitions.
+ *
+ * @lib phoneuicontrol
+ * @since S60 v9.2
+ */
+class TPhoneTransitionHandler
+    {
+    public:
+        /**
+        * default constructor.
+        */
+        TPhoneTransitionHandler(
+                CPhoneState& aState,
+                MPhoneViewCommandHandle& aViewCommandHandle );
+        
+        /**
+        * Informs view to start Transition effect if effect
+        * type is feasible for current state.
+        * @param aType a transition effect, default none
+        * EndTransEffect() must be called when update is done.
+        */
+        IMPORT_C void BeginTransEffectLC( TPhoneTransEffectType aType = EPhoneTransEffectNone );
+
+        /**
+        * Informs view to complete Transition effect
+        */
+        IMPORT_C void EndTransEffect();
+        
+        /**
+        * Informs view that UI is being updated (call bubble or number editor).
+        * EndUiUpdate() must be called when update is done.
+        */
+        IMPORT_C void BeginUiUpdateLC();
+       
+        /**
+        * Informs view that UI update is completed.
+        */
+        IMPORT_C void EndUiUpdate();
+        
+        /**
+        * Informs view that UI is being updated (call bubble or number editor).
+        * EndUiUpdate() must be called when update is done.
+        */
+        IMPORT_C void IncomingCallUiUpdateLC();
+      
+        /**
+        * Informs view that UI is being updated (call bubble or number editor).
+        * EndUiUpdate() must be called when update is done.
+        */
+        IMPORT_C void IdleCallUiUpdateLC();
+       
+        /**
+        * Informs view that UI update is completed.
+        */
+        IMPORT_C void EndUiUpdateAndEffect();
+        
+    private:
+        
+        /**
+        * TCleanupOperation to call EndUiUpdate(), if leave occurs
+        * after BeginUiUpdate().
+        */
+        static void UiUpdateCleanup(TAny* aThis );
+
+        /**
+        * TCleanupOperation to call EndTransEffect, if leave occurs
+        * after BeginTransEffect().
+        */
+        static void EffectCleanup(TAny* aThis );
+        
+    private:
+            
+        // Not owned:
+        CPhoneState& iState;
+        MPhoneViewCommandHandle& iViewCommandHandle;
+    };
+
+
+#endif // TPHONETRANSITIONHANDLER_H
--- a/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -160,14 +160,7 @@
         {
         // Convert event. Use already converted iKeyPressedDown.
         TKeyEvent keyEvent = aKeyEvent;
-        if ( keyEvent.iScanCode == EStdKeyApplication0 )
-            {
-            keyEvent.iCode = EKeyApplication0;
-            }
-        else
-            {
-            keyEvent.iCode = iKeyPressedDown;
-            }
+        keyEvent.iCode = iKeyPressedDown;
         
         // Do not handle dtmf tone if the type is EEventKey but we are not
         // expecting key up event. This happens if the key up event has been
@@ -540,8 +533,8 @@
             EPhoneViewIsDisplayingMenuOrDialog ) == 
             EPhoneViewResponseSuccess ) || ( iMenu && iMenu->IsDisplayed() );
 
-
-    return ( EKeyWasNotConsumed );
+    // Consume dialer simulated key events, pass others on
+    return ( IsKeySimulatedByTouchDialer( aKeyEvent ) ? EKeyWasConsumed : EKeyWasNotConsumed );
     }
 
 // -----------------------------------------------------------
@@ -653,7 +646,18 @@
     iPreviousScanCode = iScanCode;
 
     // Consume dialer simulated key events, pass others on
-    return EKeyWasNotConsumed;
+    TKeyResponse retValue = IsKeySimulatedByTouchDialer( aKeyEvent ) ? EKeyWasConsumed : EKeyWasNotConsumed;
+    
+    // If event is consumed, reset key specific state variables. Otherwise they may disturb
+    // handling of coming key events originating from a different key.
+    if ( retValue == EKeyWasConsumed )
+        {
+        iKeyPressedDown = EKeyNull;
+        iScanCode = EStdKeyNull; 
+        iDisplayingMenuOrDialogOnEventKeyDown = EFalse;
+        }
+    
+    return retValue;
     }
 
 // ---------------------------------------------------------
@@ -741,18 +745,16 @@
         TBool numMode = iViewCommandHandle->HandleCommandL(
               EPhoneViewIsNumberEntryNumericMode ) == EPhoneViewResponseSuccess;
         TBool simulatedByDialer = IsKeySimulatedByTouchDialer( aKeyEvent );
-    
+        
+        TUint numCode( EKeyNull );
+        
         if ( iQwertyHandler->IsQwertyInput() && numMode && !simulatedByDialer )
             {
-            TUint numCode = iQwertyHandler->NumericKeyCode( aKeyEvent );
-            if ( numCode )
-                {
-                aCode = numCode;
-                }
-            else
-                {
-                aCode = aKeyEvent.iScanCode;
-                }
+            numCode = iQwertyHandler->NumericKeyCode( aKeyEvent );
+            }
+        if ( numCode )
+            {
+            aCode = numCode;
             }
         else 
             {
--- a/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -270,9 +270,9 @@
             else
                 {
                 // Effect is shown when dialer is created.
-                iState->BeginTransEffectLC( ENumberEntryCreate );
+                iState->TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectDialerCreate );
                 iViewCommandHandle.ExecuteCommandL( EPhoneViewCreateNumberEntry );
-                iState->EndTransEffect();
+                iState->TransitionHandlerL().EndTransEffect();
                 // Go to current state implementation
                 iCbaManager.UpdateInCallCbaL();
                 iState->UpdateInCallContextMenuL();
--- a/phoneapp/phoneuicontrol/src/cphonestate.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonestate.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -56,6 +56,7 @@
 #include <phoneappvoipcommands.hrh>
 #include <hwrmdomainpskeys.h>
 #include <hal.h>
+#include <phoneui.rsg>
 
 #include "phoneui.pan"
 #include "cphonestate.h"
@@ -78,7 +79,6 @@
 #include "tphonecmdparamaudiooutput.h"
 #include "tphonecmdparamaudioavailability.h"
 #include "tphonecmdparamappinfo.h"
-#include "tphonecmdparamtranseffect.h"
 #include "tphonecmdparamringtone.h"
 #include "tphonecmdparamcustomdialer.h"
 #include "cphonekeys.h"
@@ -155,6 +155,7 @@
     delete iNumberEntryManager;
     delete iCallHeaderManager;
     delete iCbaManager;
+    delete iTransitionHandler;
     }
 
 // <-------------------------- PHONE ENGINE EVENTS --------------------------->
@@ -1569,7 +1570,7 @@
             // this should be bypasses?
         case EPhoneDialerCallHandling:
         case EPhoneCmdBack:
-            CloseClearNumberEntryAndLoadEffectL( ECallUiAppear );
+            CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiAppear );
             break;
 
         case EPhoneDialerCmdTouchInput:
@@ -2159,7 +2160,7 @@
     
         if ( phoneNumber->Des().Length() < KPhoneValidPhoneNumberLength )
             {
-            CloseClearNumberEntryAndLoadEffectL( ECallUiAppear );
+            CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiAppear );
             }
     
         CleanupStack::PopAndDestroy( phoneNumber );        
@@ -2220,7 +2221,7 @@
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::UpdateSingleActiveCallL( ) ");
     // Stop capturing keys
     CaptureKeysDuringCallNotificationL( EFalse );
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
 
     SetTouchPaneButtonEnabled( EPhoneInCallCmdHold );
 
@@ -2243,7 +2244,7 @@
         HandleChangedCallDurationL( aCallId );
         }
 
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
 
      // Go to current state implementation
     iCbaManager->UpdateInCallCbaL();
@@ -3681,9 +3682,21 @@
     // Show number busy note
     TPhoneCmdParamGlobalNote globalNoteParam;
     globalNoteParam.SetType( EAknGlobalInformationNote );
-    globalNoteParam.SetTextResourceId(
-        CPhoneMainResourceResolver::Instance()->
-        ResolveResourceID( resource ) );
+    
+    if ( CPhoneCenRepProxy::Instance()->
+            IsTelephonyFeatureSupported( KTelephonyLVFlagClearCodeCustomization ) )
+        {
+		// Show varied Number busy -note when clear code customization 
+		// is enabled
+        globalNoteParam.SetTextResourceId( R_NOTE_VAR_CAUSE_17 );
+        }
+    else
+        {
+        globalNoteParam.SetTextResourceId(
+                CPhoneMainResourceResolver::Instance()->
+                ResolveResourceID( resource ) );
+        }
+    
     globalNoteParam.SetTone( EAvkonSIDInformationTone );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewShowGlobalNote,
         &globalNoteParam );
@@ -3745,16 +3758,6 @@
     {
     if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
         {
-        // Display Video Share button instead of Hold Button if
-        // the feature is enabled and video sharing is currently available.
-        if ( aResourceId == EPhoneIncallButtons &&
-             FeatureManager::FeatureSupported( KFeatureIdFfEntryPointForVideoShare ) &&
-             CPhonePubSubProxy::Instance()->Value
-                ( KPSUidCoreApplicationUIs, KCoreAppUIsVideoSharingIndicator )
-                == ECoreAppUIsVideoSharingIndicatorOn )
-            {
-            aResourceId = EPhoneIncallVideoShareButtons;
-            }
         TPhoneCmdParamInteger integerParam;
         integerParam.SetInteger( CPhoneMainResourceResolver::Instance()->
                                  ResolveResourceID( aResourceId ) );
@@ -3864,72 +3867,6 @@
     }
 
 // -----------------------------------------------------------
-// CPhoneState::BeginUiUpdateLC
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::BeginUiUpdateLC()
-    {
-    iViewCommandHandle->ExecuteCommand( EPhoneViewBeginUpdate );
-    TCleanupItem operation( UiUpdateCleanup, this );
-    CleanupStack::PushL( operation );
-    }
-
-// -----------------------------------------------------------
-// CPhoneState::EndUiUpdate
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::EndUiUpdate()
-    {
-     CleanupStack::PopAndDestroy(); // Call UiUpdateCleanup
-    }
-	
-// -----------------------------------------------------------
-// CPhoneState::BeginTransEffectLC
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::BeginTransEffectLC( TStateTransEffectType aType )
-    {
-    __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::BeginTransEffectLC( ) ");
-    TPhoneCmdParamTransEffect effectParam;
-    switch ( aType )
-        {
-        case ENumberEntryOpen:
-            effectParam.SetType( EPhoneTransEffectDialerOpen );
-            break;
-        case ENumberEntryClose:
-            effectParam.SetType( EPhoneTransEffectDialerClose );
-            break;
-        case ENumberEntryCreate:
-            effectParam.SetType( EPhoneTransEffectDialerCreate );
-            break;
-        case ECallUiAppear:
-            effectParam.SetType( EPhoneTransEffectCallUiAppear );
-            break;
-        case ECallUiDisappear:
-            effectParam.SetType( EPhoneTransEffectCallUiDisappear );
-            break;
-        default:
-            effectParam.SetType( EPhoneTransEffectNone );
-        }
-    effectParam.SetAppUid( KUidPhoneApplication );
-    iViewCommandHandle->ExecuteCommand( 
-            EPhoneViewBeginTransEffect, 
-            &effectParam );
-    // Always put the cleanup item into stack as expected by the caller.
-    TCleanupItem operation( EffectCleanup, this );
-    CleanupStack::PushL( operation );
-    }
-
-// -----------------------------------------------------------
-// CPhoneState::EndTransEffect
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::EndTransEffect()
-    {
-    CleanupStack::PopAndDestroy(); // Call EffectCleanup
-    }
-
-// -----------------------------------------------------------
 // CPhoneState::CheckIfShowTerminationNote
 // This method is intended to be overridden in states
 // that contain more info about decision.
@@ -3967,29 +3904,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CPhoneState::UiUpdateCleanup
-// -----------------------------------------------------------------------------
-//
-void CPhoneState::UiUpdateCleanup(TAny* aThis )
-    {
-    static_cast<CPhoneState*>( aThis )->iViewCommandHandle->ExecuteCommand(
-        EPhoneViewEndUpdate );
-    }
-
-// -----------------------------------------------------------------------------
-// CPhoneState::EffectCleanup
-// -----------------------------------------------------------------------------
-//
-void CPhoneState::EffectCleanup(TAny* aThis )
-    {
-    TPhoneCmdParamTransEffect effectParam;
-    effectParam.SetType( EPhoneTransEffectStop );
-    // won't do anything if effect wasn't started
-    static_cast<CPhoneState*>( aThis )->iViewCommandHandle->ExecuteCommand(
-        EPhoneViewEndTransEffect, &effectParam );
-    }
-
-// -----------------------------------------------------------------------------
 // CPhoneState::IsDTMFEditorVisibleL
 // -----------------------------------------------------------------------------
 //
@@ -4015,7 +3929,7 @@
         iViewCommandHandle->ExecuteCommandL( 
                 EPhoneViewSetDtmfDialerViewVisible,
                 &booleanParam );
-        CloseClearNumberEntryAndLoadEffectL( ECallUiAppear );
+        CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiAppear );
         }
     else // Non-Touch
         {
@@ -4323,6 +4237,21 @@
     }
 
 // -----------------------------------------------------------
+// CPhoneState::TransitionHandlerL
+// -----------------------------------------------------------
+//
+EXPORT_C TPhoneTransitionHandler& CPhoneState::TransitionHandlerL()
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::TransitionHandlerL() ");
+    if ( !iTransitionHandler )
+        {
+        iTransitionHandler = new (ELeave)TPhoneTransitionHandler(
+                *this, *iViewCommandHandle );
+        }
+    return *iTransitionHandler;
+    }
+
+// -----------------------------------------------------------
 // CPhoneState::CallheaderManagerL
 // -----------------------------------------------------------
 //
@@ -4348,7 +4277,7 @@
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::CloseCustomizedDialerL( ) ");
     // Set dialer back to default mode.
     iViewCommandHandle->HandleCommandL( EPhoneViewHideCustomizedDialer );
-    CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose );
+    CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose );
     }
 
 // -----------------------------------------------------------------------------
@@ -4397,7 +4326,8 @@
     booleanParam.SetBoolean( ETrue );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfDialerViewVisible,
                                          &booleanParam );
-    BeginTransEffectLC( ECallUiDisappear );
+    TransitionHandlerL().
+            BeginTransEffectLC( EPhoneTransEffectCallUiDisappear );
     if ( IsNumberEntryUsedL() )
         {
         // Store the number entry content to cache
@@ -4414,7 +4344,7 @@
         // Create and display DTMF dialer
         NumberEntryManagerL()->CreateNumberEntryL();
         }
-    EndTransEffect();
+    TransitionHandlerL().EndTransEffect();
 
     // Update CBA
     iCbaManager->UpdateInCallCbaL();
@@ -4877,8 +4807,8 @@
 EXPORT_C void CPhoneState::DisplayCallSetupL( TInt aCallId )
     {
     __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::DisplayCallSetupL() ");
-    BeginTransEffectLC( ECallUiAppear );
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectCallUiAppear );
+    TransitionHandlerL().BeginUiUpdateLC();
     SetNumberEntryVisibilityL( EFalse );
     CaptureKeysDuringCallNotificationL( ETrue );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
@@ -4890,8 +4820,7 @@
     // Do state-specific operations.
     DoStateSpecificCallSetUpDefinitionsL();
     DisplayHeaderForOutgoingCallL(aCallId);
-    EndUiUpdate();
-    EndTransEffect();
+    TransitionHandlerL().EndUiUpdateAndEffect();
     iCbaManager->UpdateCbaL(EPhoneCallHandlingCallSetupCBA);
     }
 
@@ -4923,13 +4852,13 @@
 // -----------------------------------------------------------
 //
 EXPORT_C void CPhoneState::CloseClearNumberEntryAndLoadEffectL( 
-        TStateTransEffectType aType )
+        TPhoneTransEffectType aType )
     {
     __LOGMETHODSTARTEND( EPhoneControl, 
             "CPhoneState::CloseClearNumberEntryAndLoadEffectL() ");
-    BeginTransEffectLC( aType );
+    TransitionHandlerL().BeginTransEffectLC( aType );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-    EndTransEffect();
+    TransitionHandlerL().EndTransEffect();
     // Do state-specific operation when number entry is cleared
     HandleNumberEntryClearedL();
     }
--- a/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -98,6 +98,12 @@
                         KScreenSaverAllowScreenSaver,
                         EPhoneScreensaverNotAllowed );
         }
+    
+    if ( IsKeyLockOn() )
+        {
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewDisableKeyLockWithoutNote );
+        }
+    
     }
 
 // -----------------------------------------------------------
@@ -570,12 +576,10 @@
 //
 void CPhoneStateCallSetup::HandleConnectedL( TInt aCallId )
     {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleConnectedL()");        
-
-    // Close menu bar, if it is displayed
+    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateCallSetup::HandleConnectedL()");
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
     
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
         
     // Remove the number entry if it isn't DTMF dialer
     if ( !iOnScreenDialer || !IsNumberEntryVisibleL() || !IsDTMFEditorVisibleL() )
@@ -597,11 +601,9 @@
 
     SetToolbarDimming( EFalse );
 
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     
-    // Go to single state
     UpdateCbaL( EPhoneCallHandlingInCallCBA );    
-
     iStateMachine->ChangeState( EPhoneStateSingle );
     }
 
@@ -615,13 +617,15 @@
     if ( !NeedToReturnToForegroundAppL() &&
          IsNumberEntryUsedL() )
         {
-        BeginTransEffectLC( ECallUiDisappear );
+        TransitionHandlerL().
+                BeginTransEffectLC( EPhoneTransEffectCallUiDisappear );
         }
     else 
         {
-        BeginTransEffectLC( ENumberEntryOpen );
+        TransitionHandlerL().
+                BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen );
         }
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     // Disable the volume display
     iViewCommandHandle->ExecuteCommandL( EPhoneViewHideNaviPaneAudioVolume );
@@ -664,8 +668,7 @@
         DisplayIdleScreenL();
         }
         
-    EndUiUpdate();
-    EndTransEffect(); 
+    TransitionHandlerL().EndUiUpdateAndEffect();
     // No need update cba
     iStateMachine->ChangeState( EPhoneStateIdle );
     }
--- a/phoneapp/phoneuicontrol/src/cphonestateidle.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonestateidle.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -420,11 +420,8 @@
 void CPhoneStateIdle::HandleIncomingL( TInt aCallId )
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIncomingL( ) ");
-
     HandleAudioAvailableOutputChangedL();
-    
     iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume );
-
     SetRingingTonePlaybackL( aCallId );
     
     CPhonePubSubProxy::Instance()->ChangePropertyValue(
@@ -432,10 +429,7 @@
         KScreenSaverAllowScreenSaver,
         EPhoneScreensaverNotAllowed );
     
-    IsNumberEntryUsedL() ? 
-        BeginTransEffectLC( ECallUiAppear ) :
-        BeginTransEffectLC( ENumberEntryOpen );
-    BeginUiUpdateLC();
+    TransitionHandlerL().IncomingCallUiUpdateLC();
     
     // Hide the number entry if it exists
     if ( IsNumberEntryUsedL() )
@@ -451,13 +445,9 @@
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
     SetTouchPaneButtonEnabled( EPhoneInCallCmdHold );
     
-    // Display incoming call
     DisplayIncomingCallL( aCallId );
-
-    EndUiUpdate();
-    EndTransEffect();
+    TransitionHandlerL().EndUiUpdateAndEffect();
     
-    // Go to incoming state
     iCbaManager->UpdateIncomingCbaL( aCallId );
     UpdateSilenceButtonDimming();
     UpdateIncomingContextMenuL( aCallId );
@@ -465,7 +455,6 @@
     SetToolbarDimming( ETrue );
     //request that dimmed toolbar is visible.
     iViewCommandHandle->HandleCommandL( EPhoneViewShowToolbar );
-    
     ChangeTo( EPhoneStateIncoming );
     }
 
@@ -500,6 +489,13 @@
     SetToolbarButtonLoudspeakerEnabled();
     SetToolbarButtonHandsetEnabled();
     SetToolbarButtonBTHFEnabled();
+
+    TPhoneCmdParamInteger uidParam;
+    uidParam.SetInteger( KUidPhoneApplication.iUid );
+
+    // Set Phone as the top application
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
+       &uidParam );
     }
 
 // -----------------------------------------------------------
@@ -523,8 +519,8 @@
         iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground, 
             &uidParam );
         }
-    BeginTransEffectLC( ENumberEntryClose );
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiClose );
+    TransitionHandlerL().BeginUiUpdateLC();
     
     // Remove the number entry
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
@@ -539,10 +535,8 @@
     SetTouchPaneButtons( EPhoneIncallButtons );
     SetToolbarDimming( EFalse );
     
-    EndUiUpdate();
-    EndTransEffect();
+    TransitionHandlerL().EndUiUpdateAndEffect();
   
-    // Go to single state
     iCbaManager->UpdateCbaL( EPhoneCallHandlingInCallCBA );
     ChangeTo( EPhoneStateSingle );
     }
@@ -580,15 +574,15 @@
             break;
             
         case EPhoneCmdBack:
-            BeginTransEffectLC( ENumberEntryClose );
+            TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiClose );
             HandleBackCommandL();
-            EndTransEffect();
+            TransitionHandlerL().EndTransEffect();
             break;
         
         case EPhoneViewOpenNumberEntry:
-            BeginTransEffectLC( ENumberEntryOpen );
+            TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen );
             commandStatus = CPhoneState::HandleCommandL( aCommand );
-            EndTransEffect();
+            TransitionHandlerL().EndTransEffect();
             break;
             
         default:
@@ -886,7 +880,7 @@
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIdleL()" );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveAllCallHeaders );
-    CloseClearNumberEntryAndLoadEffectL( ECallUiDisappear );
+    CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiDisappear );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
     // Reset flag.
     SetCallInitialized( EFalse );
@@ -932,7 +926,7 @@
     "CPhoneStateIdle::RemoveNumberEntryAndSetIdleToBackgroundIfNeededL( ) ");
     if ( IsNumberEntryUsedL() )
         {
-        BeginTransEffectLC( ECallUiAppear );
+        TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectCallUiAppear );
         /*NE should be removed because if speeddial dial is interupted during
         call setup phone should not return to NE/Dialler view.*/
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
@@ -944,7 +938,7 @@
             iCbaManager->UpdateCbaL( EPhoneEmptyCBA );
             iViewCommandHandle->ExecuteCommandL( EPhoneViewSetIdleTopApplication );
             }
-        EndTransEffect();
+        TransitionHandlerL().EndTransEffect();
         }
     }
 
@@ -1107,7 +1101,7 @@
 
                 if ( IsNumberEntryUsedL() )
                     {
-                    CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose );
+                    CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose );
                     // If long end key event occures then all calls are terminated and
                     // dialer is closed, therefore tel.icon must be removed from FSW.
                     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW );
@@ -1120,7 +1114,7 @@
                 }
             else if ( IsNumberEntryUsedL() && TopAppIsDisplayedL() )
                 {
-                CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose );
+                CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose );
                 }
             else if ( !TopAppIsDisplayedL() )
                 {
--- a/phoneapp/phoneuicontrol/src/cphonestateincall.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonestateincall.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -141,7 +141,15 @@
             
 #ifdef RD_INTELLIGENT_TEXT_INPUT
         case EKeyEnter:
-            if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
+            {
+            TPhoneCmdParamInteger numberEntryCountParam;
+            iViewCommandHandle->ExecuteCommandL( 
+                 EPhoneViewGetNumberEntryCount,
+                 &numberEntryCountParam );
+            
+            TInt neLength( numberEntryCountParam.Integer() );
+                      
+            if ( iOnScreenDialer && IsDTMFEditorVisibleL() && neLength > 0 )
                 {
                 SendDtmfL();    
                 }
@@ -154,18 +162,13 @@
                     }
                 else
                     {
-                    TPhoneCmdParamInteger numberEntryCountParam;
-                    iViewCommandHandle->ExecuteCommandL( 
-                           EPhoneViewGetNumberEntryCount,
-                           &numberEntryCountParam );
-                    
-                    TInt neLength( numberEntryCountParam.Integer() );
                     if ( neLength > 0 )
                        {
                        HandleCommandL( EPhoneNumberAcqCmdSendCommand );
                        }
                     }      
                 }
+            }
             break;
 #endif            
           
@@ -306,17 +309,10 @@
     __LOGMETHODSTARTEND(EPhoneControl,  
         "CPhoneStateInCall::HandleIdleL()" );
     __ASSERT_DEBUG( aCallId >= 0, Panic( EPhoneCtrlParameterNotInitialized ) );
+    TransitionHandlerL().IdleCallUiUpdateLC();
+    
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
-    if (  IsNumberEntryUsedL() )
-        {
-        BeginTransEffectLC( ECallUiDisappear );
-        }
-    else 
-        {
-        BeginTransEffectLC( ENumberEntryClose );
-        }
-    BeginUiUpdateLC();
     SetDefaultFlagsL();
         
     if ( IsNumberEntryUsedL() )
@@ -354,8 +350,7 @@
         }
         
     DeleteTouchPaneButtons();
-    EndUiUpdate();
-    EndTransEffect();
+    TransitionHandlerL().EndUiUpdateAndEffect();
     DisplayCallTerminationNoteL();
     iStateMachine->ChangeState( EPhoneStateIdle );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
@@ -611,13 +606,14 @@
     switch( aCommand )
         {
         case EPhoneInCallCmdDialer:
-            BeginTransEffectLC( ECallUiDisappear );
+            TransitionHandlerL().
+                BeginTransEffectLC( EPhoneTransEffectCallUiDisappear );
             if ( !IsNumberEntryUsedL() )
                 {
                 CreateNumberEntryL();
                 }
             SetNumberEntryVisibilityL( ETrue ); 
-            EndTransEffect();
+            TransitionHandlerL().EndTransEffect();
           break;
           
         case EPhoneCmdOptions:
@@ -851,10 +847,11 @@
        case EPhoneViewOpenCallHandling:
             if ( iOnScreenDialer && IsNumberEntryUsedL() )
                 {
-                BeginTransEffectLC( ECallUiAppear );
+                TransitionHandlerL().
+                        BeginTransEffectLC( EPhoneTransEffectCallUiAppear );
                 // Remove number entry from screen
                 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-                EndTransEffect();
+                TransitionHandlerL().EndTransEffect();
                 HandleNumberEntryClearedL();
                 }
             commandStatus = CPhoneState::HandleCommandL( aCommand );        
@@ -929,7 +926,8 @@
     if ( iOnScreenDialer )
         {
         //In touch, just activate dialer
-        BeginTransEffectLC( ECallUiDisappear );
+        TransitionHandlerL().
+                BeginTransEffectLC( EPhoneTransEffectCallUiDisappear );
         if ( IsNumberEntryUsedL() )
             {
             SetNumberEntryVisibilityL(ETrue);   
@@ -939,7 +937,7 @@
             CreateNumberEntryL();
             SetNumberEntryVisibilityL(ETrue); 
             }
-        EndTransEffect();
+        TransitionHandlerL().EndTransEffect();
         }
     else
         {
@@ -1558,7 +1556,7 @@
                 }
             else
                 {    
-                CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose );
+                CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose );
                 }
             }
 
@@ -1652,14 +1650,7 @@
     if ( aCategory == KPSUidCoreApplicationUIs &&
          aKey == KCoreAppUIsVideoSharingIndicator )
         {
-        if ( aValue == ECoreAppUIsVideoSharingIndicatorOn )
-            {
-            SetTouchPaneButtons( EPhoneIncallVideoShareButtons );
-            }
-        else
-            {
-            SetTouchPaneButtons( EPhoneIncallButtons );
-            }
+        SetTouchPaneButtons( EPhoneIncallButtons );
         }
     else
         {
--- a/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -370,12 +370,12 @@
         &globalNotifierParam );
     // Stop tone playing, if necessary
     iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     // Update single call
     UpdateSingleActiveCallL( aCallId );
     SetTouchPaneButtons( EPhoneIncallButtons );
     SetToolbarDimming( EFalse );
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     iCbaManager->UpdateCbaL( EPhoneCallHandlingInCallCBA );
     iStateMachine->ChangeState( EPhoneStateSingle );
     }
@@ -422,8 +422,7 @@
     {
     __LOGMETHODSTARTEND(EPhoneControl,
         "CPhoneStateIncoming::HandleIdleL ()" );
-    BeginTransEffectLC( ENumberEntryClose );
-    BeginUiUpdateLC();
+    TransitionHandlerL().IdleCallUiUpdateLC();
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
@@ -463,8 +462,7 @@
         }
  
     DeleteTouchPaneButtons();
-    EndUiUpdate();
-    EndTransEffect();
+    TransitionHandlerL().EndUiUpdateAndEffect();
     iCbaManager->UpdateCbaL( EPhoneEmptyCBA );
     iStateMachine->ChangeState( EPhoneStateIdle );
     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuicontrol/src/tphonetransitionhandler.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -0,0 +1,156 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Class handles phoneapp internal/external transitions.
+*
+*/
+
+#include "tphonetransitionhandler.h"
+#include "cphonestate.h"
+#include "phonelogger.h"
+
+// ---------------------------------------------------------------------------
+// TPhoneTransitionHandler::TPhoneTransitionHandler
+// ---------------------------------------------------------------------------
+//
+TPhoneTransitionHandler::TPhoneTransitionHandler(
+        CPhoneState& aState,
+        MPhoneViewCommandHandle& aViewCommandHandle )
+   : iState ( aState ), 
+     iViewCommandHandle ( aViewCommandHandle )
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, 
+            "TPhoneTransitionHandler::TPhoneTransitionHandler( ) ");
+    }
+
+// -----------------------------------------------------------------------------
+// TPhoneTransitionHandler::BeginUiUpdateLC
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void TPhoneTransitionHandler::BeginUiUpdateLC()
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, 
+            "TPhoneTransitionHandler::BeginUiUpdateLC( ) ");
+    iViewCommandHandle.ExecuteCommand( EPhoneViewBeginUpdate );
+    TCleanupItem operation( UiUpdateCleanup, this );
+    CleanupStack::PushL( operation );
+    }
+
+// -----------------------------------------------------------------------------
+// TPhoneTransitionHandler::EndUiUpdate
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void TPhoneTransitionHandler::EndUiUpdate()
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, 
+            "TPhoneTransitionHandler::EndUiUpdate( ) ");
+    CleanupStack::PopAndDestroy(); // Call UiUpdateCleanup
+    }
+
+// -----------------------------------------------------------------------------
+// TPhoneTransitionHandler::IncomingCallUiUpdateLC
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void TPhoneTransitionHandler::IncomingCallUiUpdateLC()
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, 
+            "TPhoneTransitionHandler::IncomingCallUiUpdateLC( ) ");
+    iState.IsNumberEntryUsedL() ?
+        BeginTransEffectLC( EPhoneTransEffectCallUiAppear ) :
+        BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen );
+    BeginUiUpdateLC();
+    }
+
+// -----------------------------------------------------------------------------
+// TPhoneTransitionHandler::IdleCallUiUpdateLC
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void TPhoneTransitionHandler::IdleCallUiUpdateLC()
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, "TPhoneTransitionHandler::IdleCallUiUpdateLC( ) ");
+    iState.IsNumberEntryUsedL() ?
+        BeginTransEffectLC( EPhoneTransEffectCallUiDisappear ) :
+        BeginTransEffectLC( EPhoneTransEffectPhoneUiClose );
+    BeginUiUpdateLC();
+    }
+
+// -----------------------------------------------------------------------------
+// TPhoneTransitionHandler::EndUiUpdateAndEffect
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void TPhoneTransitionHandler::EndUiUpdateAndEffect()
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, 
+            "TPhoneTransitionHandler::EndUiUpdateAndEffect( ) ");
+    EndUiUpdate();
+    EndTransEffect();
+    }
+
+// -----------------------------------------------------------------------------
+// TPhoneTransitionHandler::BeginTransEffectLC
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void TPhoneTransitionHandler::BeginTransEffectLC( TPhoneTransEffectType aType )
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, 
+            "TPhoneTransitionHandler::BeginTransEffectLC( ) ");
+    TPhoneCmdParamTransEffect effectParam;
+    effectParam.SetType( aType );
+    effectParam.SetAppUid( KUidPhoneApplication );
+    iViewCommandHandle.ExecuteCommand( 
+            EPhoneViewBeginTransEffect, 
+            &effectParam );
+    // Always put the cleanup item into stack as expected by the caller.
+    TCleanupItem operation( EffectCleanup, this );
+    CleanupStack::PushL( operation );
+    }
+
+// -----------------------------------------------------------------------------
+// TPhoneTransitionHandler::EndTransEffect
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void TPhoneTransitionHandler::EndTransEffect()
+    {
+    __LOGMETHODSTARTEND( EPhoneControl,
+            "TPhoneTransitionHandler::EndTransEffect( ) ");
+    CleanupStack::PopAndDestroy(); // Call EffectCleanup
+    }
+
+// -----------------------------------------------------------------------------
+// TPhoneTransitionHandler::UiUpdateCleanup
+// -----------------------------------------------------------------------------
+//
+void TPhoneTransitionHandler::UiUpdateCleanup(TAny* aThis )
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, 
+            "TPhoneTransitionHandler::UiUpdateCleanup( ) ");
+    static_cast<TPhoneTransitionHandler*>( aThis )->
+            iViewCommandHandle.ExecuteCommand( EPhoneViewEndUpdate );
+    }
+
+// -----------------------------------------------------------------------------
+// TPhoneTransitionHandler::EffectCleanup
+// -----------------------------------------------------------------------------
+//
+void TPhoneTransitionHandler::EffectCleanup(TAny* aThis )
+    {
+    __LOGMETHODSTARTEND( EPhoneControl, 
+            "TPhoneTransitionHandler::EffectCleanup( ) ");
+    TPhoneCmdParamTransEffect effectParam;
+    effectParam.SetType( EPhoneTransEffectStop );
+    // won't do anything if effect wasn't started
+    static_cast<TPhoneTransitionHandler*>( aThis )->
+            iViewCommandHandle.ExecuteCommand( 
+                    EPhoneViewEndTransEffect, &effectParam );
+    }
+
--- a/phoneapp/phoneuistates/inc/cphoneconference.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/inc/cphoneconference.h	Tue Sep 14 21:18:17 2010 +0300
@@ -147,6 +147,8 @@
         
         void MakeStateTransitionToIdleL();
         
+        TBool MakeTransitionToWaitingInSingleL();
+        
         void HandleDialingL( TInt aCallId );
               
         void CallFromNewCallQueryL();
--- a/phoneapp/phoneuistates/inc/cphoneerrormessageshandler.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/inc/cphoneerrormessageshandler.h	Tue Sep 14 21:18:17 2010 +0300
@@ -114,6 +114,11 @@
         * Return ETrue if voice call.
         */
         TBool IsVoiceCall( const TInt aCallId ) const;
+        
+        /**
+         * Variation for error notes KTelephonyLVFlagClearCodeCustomization
+         */
+        TInt ResourceVariation() const;
  
     protected:
 		
@@ -123,6 +128,8 @@
 		MPhoneViewCommandHandle* iViewCommandHandle;
 		
 		MPhoneStateMachine* iStateMachine;
+		
+		TInt iCallId;
 	          
     };
 
--- a/phoneapp/phoneuistates/src/cphonealerting.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonealerting.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -132,7 +132,7 @@
 
                 if ( IsNumberEntryUsedL() )
                     {
-                    CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose );
+                    CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose );
                     }
                 if ( !TopAppIsDisplayedL() )
                     {
@@ -241,7 +241,7 @@
     // Close menu bar, if it is displayed
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
 
     // Update the single call
     UpdateSingleActiveCallL( aCallId );
@@ -250,7 +250,7 @@
 
     SetToolbarDimming( EFalse );
 
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     
     // Go to single state
     UpdateCbaL( EPhoneCallHandlingInCallCBA );    
--- a/phoneapp/phoneuistates/src/cphonecallsetup.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonecallsetup.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -158,7 +158,7 @@
     // when the remote party receives the call. So, in CDMA, the user
     // should still be able to cancel the MO call before the call is connected.
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneCallSetup::HandleConnectingL()");
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     UpdateRemoteInfoDataL ( aCallId );
     
     SetNeedToReturnToForegroundAppStatusL( EFalse );
@@ -187,7 +187,7 @@
 
     SetToolbarButtonLoudspeakerEnabled();
 
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     
     UpdateCbaL( EPhoneCallHandlingInCallCBA );
     iStateMachine->ChangeState( EPhoneStateAlerting );
--- a/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -182,7 +182,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneCallSetupAndWaiting::HandleIdleL()");
         
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
             
     // Remove call 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
@@ -238,7 +238,7 @@
         iStateMachine->ChangeState( EPhoneStateAlerting );            
         }
     
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     }
         
 // -----------------------------------------------------------
@@ -264,7 +264,7 @@
     // Close menu bar, if it is displayed
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
     
-    CPhoneState::BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
 
     // Update bubble
     TPhoneCmdParamCallHeaderData callHeaderParam;
@@ -276,7 +276,7 @@
     CPhoneState::SetTouchPaneButtons( EPhoneWaitingCallButtons );
     SetToolbarDimming( EFalse );
     
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
  
     if ( CPhoneState::IsNumberEntryUsedL() )
         {
--- a/phoneapp/phoneuistates/src/cphoneconference.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneconference.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -194,10 +194,10 @@
     switch( aCommand )
         {   
         case EAknSoftkeyCancel:
-            BeginUiUpdateLC();
+            TransitionHandlerL().BeginUiUpdateLC();
             CloseSelectionListL();
             SetTouchPaneButtons( EPhoneConferenceButtons );
-            EndUiUpdate();    
+            TransitionHandlerL().EndUiUpdate();
             UpdateCbaL( EPhoneCallHandlingInCallCBA );
             break;
     
@@ -398,14 +398,12 @@
 //
 void CPhoneConference::HandleIdleL( TInt aCallId )
     {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
-        "CPhoneConference::HandleIdleL()");
+    __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::HandleIdleL()");
     // Re-enable global notes
     TPhoneCmdParamBoolean globalNotifierParam;
     globalNotifierParam.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
         &globalNotifierParam );
-
     // Stop capturing keys
     CaptureKeysDuringCallNotificationL( EFalse );
 
@@ -431,7 +429,7 @@
         {
         // Remove call header
         iViewCommandHandle->ExecuteCommandL( 
-            EPhoneViewRemoveCallHeader, aCallId );    
+            EPhoneViewRemoveCallHeader, aCallId );
         }
     }
     
@@ -443,43 +441,22 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConference::HandleConferenceIdleL()");
-    BeginTransEffectLC( ENumberEntryClose );
-    BeginUiUpdateLC();
-    
+    TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiClose );
+    TransitionHandlerL().BeginUiUpdateLC();
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
-
     TPhoneCmdParamInteger activeCallCount;
-    iViewCommandHandle->ExecuteCommandL(
-        EPhoneViewGetCountOfActiveCalls, &activeCallCount );
-
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCountOfActiveCalls, &activeCallCount );
+    
     switch( activeCallCount.Integer() )
         {
         case ENoActiveCalls:
             MakeStateTransitionToIdleL();
             break; 
-            
         case EOneActiveCall:
-            {
-            // Fetch ringing call's id from view
-            TPhoneCmdParamCallStateData callStateData;
-            callStateData.SetCallState( EPEStateRinging );
-            iViewCommandHandle->HandleCommandL(
-                EPhoneViewGetCallIdByState, &callStateData );
-                
-            if( callStateData.CallId() > KErrNotFound )
-                {            
-                CPhonePubSubProxy::Instance()->ChangePropertyValue(
-                                KPSUidScreenSaver,
-                                KScreenSaverAllowScreenSaver,
-                                EPhoneScreensaverNotAllowed );
-                UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
-                iStateMachine->ChangeState( EPhoneStateWaitingInSingle );    
-                }
-            else
+            if ( !MakeTransitionToWaitingInSingleL() )
                 {
                 MakeStateTransitionToSingleL();
                 }
-            }
             break;
             
         case ETwoActiveCalls:
@@ -490,8 +467,7 @@
             MakeStateTransitionToTwoSinglesL();
             break;
         }
-    EndUiUpdate();
-    EndTransEffect();     
+    TransitionHandlerL().EndUiUpdateAndEffect();
     }
 
 // -----------------------------------------------------------
@@ -570,7 +546,6 @@
     TPhoneCmdParamBoolean holdFlag;
     holdFlag.SetBoolean( ETrue );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-
     }
 
 // -----------------------------------------------------------
@@ -609,7 +584,6 @@
         }
     
     SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
-    
     UpdateInCallCbaL();
     }
 
@@ -625,7 +599,6 @@
     booleanParam.SetBoolean( ETrue );
     iViewCommandHandle->ExecuteCommandL( 
         EPhoneViewOpenConferenceList, &booleanParam );
-
     iCbaManager->SetCbaL( EPhoneDropParticipantCBA );
     }
 
@@ -641,14 +614,13 @@
     TPhoneViewResponseId response;
     TPhoneCmdParamInteger callId;
     response = iViewCommandHandle->HandleCommandL(
-        EPhoneViewSelectedConfMember, &callId );    
+        EPhoneViewSelectedConfMember, &callId );
         
     if( response == EPhoneViewResponseSuccess )
         {
-        // Drop the call from conference
-        iStateMachine->SetCallId( callId.Integer() );    
+        iStateMachine->SetCallId( callId.Integer() );
         iStateMachine->SendPhoneEngineMessage( 
-            CPEPhoneModelIF::EPEMessageDropConferenceMember );            
+            CPEPhoneModelIF::EPEMessageDropConferenceMember );
         }
     }
 
@@ -664,7 +636,6 @@
     booleanParam.SetBoolean( ETrue );
     iViewCommandHandle->ExecuteCommandL( 
         EPhoneViewOpenConferenceList, &booleanParam );
-
     iCbaManager->SetCbaL( EPhonePrivateParticipantCBA );
     }
 
@@ -690,12 +661,12 @@
             CPEPhoneModelIF::EPEMessageGoOneToOne );
         
         // Update call view
-        BeginUiUpdateLC();
+        TransitionHandlerL().BeginUiUpdateLC();
         CloseSelectionListL();
         SetTouchPaneButtons( EPhoneConferenceButtons );
-        EndUiUpdate();    
+        TransitionHandlerL().EndUiUpdate();
                 
-        UpdateCbaL( EPhoneCallHandlingInCallCBA );               
+        UpdateCbaL( EPhoneCallHandlingInCallCBA );
         }
     }
 
@@ -707,7 +678,6 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConference::MakeStateTransitionToIdleL()");
-    
     SetDefaultFlagsL();
 
     if ( IsNumberEntryUsedL() )
@@ -716,9 +686,7 @@
             {
             // Return phone to the background if menu application is needed to foreground.
             iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
-    
             iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
-    
             // Set Number Entry CBA
             iCbaManager->SetCbaL( EPhoneNumberAcqCBA );
             }
@@ -726,10 +694,9 @@
             {
             // Show the number entry if it exists
             SetNumberEntryVisibilityL(ETrue);
-        
             // Close dtmf dialer when call is disconnected.
             if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
-                {            
+                {
                 CloseDTMFEditorL();
                 // Display idle screen and update CBAs
                 DisplayIdleScreenL();
@@ -738,28 +705,48 @@
         }  
     else if ( !TopAppIsDisplayedL() || NeedToReturnToForegroundAppL() )
         {
-        // Close menu bar, if it is displayed
         iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-        
         // Continue displaying current app but set up the 
         // idle screen in the background
         SetupIdleScreenInBackgroundL();
         }
     else
         {
-        // Close menu bar, if it is displayed
         iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-        
-         // Display idle screen
         DisplayIdleScreenL();
         }
 
     // Display call termination note, if necessary
     DisplayCallTerminationNoteL();
+    UpdateCbaL( EPhoneEmptyCBA );
+    iStateMachine->ChangeState( EPhoneStateIdle );
+    }
 
-    UpdateCbaL( EPhoneEmptyCBA );
-    // Go to idle state
-    iStateMachine->ChangeState( EPhoneStateIdle );
+// -----------------------------------------------------------
+// CPhoneConference::MakeTransitionToWaitingInSingleL
+// -----------------------------------------------------------
+//
+TBool CPhoneConference::MakeTransitionToWaitingInSingleL()
+    {
+    __LOGMETHODSTARTEND( EPhoneUIStates, 
+        "CPhoneConference::MakeTransitionToWaitingInSingleL()");
+    TBool retValue(EFalse);    
+    TPhoneCmdParamCallStateData callStateData;
+    callStateData.SetCallState( EPEStateRinging );
+    iViewCommandHandle->HandleCommandL(
+        EPhoneViewGetCallIdByState, &callStateData );
+    
+    if (  callStateData.CallId() > KErrNotFound )
+        {
+        CPhonePubSubProxy::Instance()->ChangePropertyValue( 
+                KPSUidScreenSaver,
+                KScreenSaverAllowScreenSaver,
+                EPhoneScreensaverNotAllowed );
+        UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+        iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
+        retValue = ETrue;
+        }
+    return retValue;
     }
 
 // -----------------------------------------------------------
@@ -770,15 +757,10 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConference::MakeStateTransitionToSingleL()");
-    // Close menu bar, if it is displayed
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
- 
-
-    SetTouchPaneButtons( EPhoneIncallButtons );    
-  
-    // Go to single state
+    SetTouchPaneButtons( EPhoneIncallButtons ); 
     UpdateCbaL( EPhoneCallHandlingInCallCBA );
-    iStateMachine->ChangeState( EPhoneStateSingle );        
+    iStateMachine->ChangeState( EPhoneStateSingle );
     }
 
 // -----------------------------------------------------------
@@ -789,17 +771,10 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConference::MakeStateTransitionToTwoSinglesL()");
-    // Close menu bar, if it is displayed
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-
-        
-    SetTouchPaneButtons( EPhoneTwoSinglesButtons );        
-    
-    // Set Two singles softkeys
+    SetTouchPaneButtons( EPhoneTwoSinglesButtons );
     UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
-
-    // Go to two singles state
-    iStateMachine->ChangeState( EPhoneStateTwoSingles );        
+    iStateMachine->ChangeState( EPhoneStateTwoSingles );
     }
 
 // -----------------------------------------------------------
@@ -905,16 +880,11 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConference::HandleIncomingL()");
-    
     CPhonePubSubProxy::Instance()->ChangePropertyValue(
                     KPSUidScreenSaver,
                     KScreenSaverAllowScreenSaver,
                     EPhoneScreensaverNotAllowed );
-    
-    IsNumberEntryUsedL() ? 
-        BeginTransEffectLC( ECallUiAppear ) :
-        BeginTransEffectLC( ENumberEntryOpen );
-    BeginUiUpdateLC();
+    TransitionHandlerL().IncomingCallUiUpdateLC();
     
     // Hide the number entry if it exists
     if ( IsNumberEntryUsedL() )
@@ -926,10 +896,9 @@
     // after call is ended.
     SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() );
     
+    // Get allow waiting call header param value.
     TPhoneCmdParamBoolean dialerParam;
     dialerParam.SetBoolean( ETrue );
-    
-    // Get allow waiting call header param value.
     AllowShowingOfWaitingCallHeaderL( dialerParam );
             
     CloseSelectionListL();
@@ -939,13 +908,9 @@
 
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
     
-    // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam );
+    TransitionHandlerL().EndUiUpdateAndEffect();
 
-    EndUiUpdate();
-    EndTransEffect();
-
-    // Go to incoming state
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
     iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting );        
     }
@@ -992,7 +957,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConference::HandleWentOneToOneL()");
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     // Update conference bubble
     iViewCommandHandle->ExecuteCommandL(
@@ -1016,7 +981,7 @@
         {            
         SetTouchPaneButtons( EPhoneTwoSinglesButtons );
         }       
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     }
 
 // -----------------------------------------------------------
@@ -1025,7 +990,7 @@
 //    
 void CPhoneConference::OpenParticipantsListL()
     {
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     TPhoneCmdParamBoolean booleanParam;
     booleanParam.SetBoolean( ETrue );
@@ -1035,7 +1000,7 @@
 
     SetTouchPaneButtons( EPhoneParticipantListButtons );
                                          
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     
     iCbaManager->SetCbaL( EPhoneParticipantListCBA );
      
--- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -248,7 +248,7 @@
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::HandleConnectingL()");
     
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
         
     UpdateRemoteInfoDataL ( aCallId );
     
@@ -282,7 +282,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );       
         
-    EndUiUpdate();        
+    TransitionHandlerL().EndUiUpdate();
     }
     
 // -----------------------------------------------------------
@@ -296,7 +296,7 @@
     // Close menu bar, if it is displayed
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
  
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
         
     // Show bubble
     TPhoneCmdParamCallHeaderData callHeaderParam;
@@ -316,7 +316,7 @@
     
     SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
     SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
-    EndUiUpdate(); 
+    TransitionHandlerL().EndUiUpdate(); 
     
     UpdateCbaL ( EPhoneCallHandlingNewCallSwapCBA );
    
@@ -381,8 +381,8 @@
     else
         {
         // Remove  outgoing call 
-        BeginTransEffectLC( ENumberEntryOpen );
-        BeginUiUpdateLC();
+        TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen );
+        TransitionHandlerL().BeginUiUpdateLC();
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
         CheckIfRestoreNEContentAfterDtmfDialer();
         if ( IsNumberEntryUsedL() )
@@ -392,8 +392,7 @@
             }
             
         SetTouchPaneButtons( EPhoneConferenceButtons );
-        EndUiUpdate();
-        EndTransEffect(); 
+        TransitionHandlerL().EndUiUpdateAndEffect();
         UpdateCbaL( EPhoneCallHandlingInCallCBA );
         iStateMachine->ChangeState( EPhoneStateConference );
         }
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -324,13 +324,13 @@
     holdFlag.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
     
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     iViewCommandHandle->ExecuteCommandL( 
         EPhoneViewUpdateBubble, KConferenceCallId, &callHeaderParam );
     
     SetTouchPaneButtons( EPhoneConferenceAndHeldSingleButtons );
     
-    EndUiUpdate();          
+    TransitionHandlerL().EndUiUpdate();
     }
 
 
@@ -359,13 +359,13 @@
          
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateMaxConfMemberFlag );
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
      
     iViewCommandHandle->ExecuteCommandL( 
         EPhoneViewUpdateBubble, KConferenceCallId, &callHeaderParam );
         
     SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );    
-    EndUiUpdate();     
+    TransitionHandlerL().EndUiUpdate();
     }
 
 // -----------------------------------------------------------
@@ -420,7 +420,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleAddedConferenceMemberL");
     
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
         
     // Update conference bubble
     iViewCommandHandle->ExecuteCommandL( EPhoneViewAddToConference );
@@ -430,7 +430,7 @@
     SetTouchPaneButtons( EPhoneConferenceButtons );
     SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
     
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
 
     TPhoneCmdParamBoolean conferenceAndSingleFlag;
     conferenceAndSingleFlag.SetBoolean( EFalse );
@@ -460,10 +460,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
             "CPhoneConferenceAndSingle::HandleIncomingL");
-    IsNumberEntryUsedL() ? 
-        BeginTransEffectLC( ECallUiAppear ) :
-        BeginTransEffectLC( ENumberEntryOpen );
-    BeginUiUpdateLC();  
+    TransitionHandlerL().IncomingCallUiUpdateLC();
     
     // Hide the number entry if it exists
     if ( IsNumberEntryUsedL() )
@@ -471,10 +468,9 @@
         SetNumberEntryVisibilityL( EFalse );
         }
     
+    // Get allow waiting call header param value.
     TPhoneCmdParamBoolean dialerParam;
     dialerParam.SetBoolean( ETrue );
-    
-    // Get allow waiting call header param value.
     AllowShowingOfWaitingCallHeaderL( dialerParam );
     
     // Close conference list
@@ -489,20 +485,17 @@
     SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
 
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
-        
-    // Display incoming call
+    
     DisplayIncomingCallL( aCallId, dialerParam  );
-
-    EndUiUpdate();
-    EndTransEffect();
+    TransitionHandlerL().EndUiUpdateAndEffect();
+    
     TPhoneCmdParamBoolean conferenceAndSingleFlag;
     conferenceAndSingleFlag.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag, 
-    	&conferenceAndSingleFlag );
-    
-    // Go to Conference And Single And Waiting state
+            &conferenceAndSingleFlag );
+
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
-    iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting );                
+    iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting );
     }
 
 // -----------------------------------------------------------
@@ -535,7 +528,7 @@
     else
         {       
         // Remove call
-        BeginUiUpdateLC(); 
+        TransitionHandlerL().BeginUiUpdateLC(); 
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 
 	    TPhoneCmdParamBoolean conferenceAndSingleFlag;
@@ -556,10 +549,7 @@
 	        
 	        UpdateCbaL( EPhoneCallHandlingInCallCBA );
 	        }
-      
-
-        EndUiUpdate();
-
+        TransitionHandlerL().EndUiUpdate();
         iStateMachine->ChangeState( EPhoneStateConference );
         }
     
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -198,7 +198,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndSingleAndWaiting::HandleIdleL()");
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
 
@@ -240,7 +240,7 @@
                 }
             }
         }
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     }
 
 // -----------------------------------------------------------
@@ -341,7 +341,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndSingleAndWaiting::HandleConferenceIdleL()");
     
-    BeginUiUpdateLC();    
+    TransitionHandlerL().BeginUiUpdateLC();    
     
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );    
         
@@ -353,7 +353,7 @@
 
     MakeTransitionAccordingToActiveCallsL();
     
-    EndUiUpdate();    	    
+    TransitionHandlerL().EndUiUpdate();
     }
 
 // --------------------------------------------------------------
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -265,7 +265,7 @@
 void CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt aCallId )
     {
     __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()");
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     UpdateRemoteInfoDataL ( aCallId );
     if ( IsConferenceBubbleInSelectionMode() )
@@ -291,7 +291,7 @@
     SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
     SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
     
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     // CBA updates in above if-else conditions
     iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
     }
@@ -316,7 +316,7 @@
     
     if( iRingingCallId == aCallId )
         {
-        BeginUiUpdateLC();
+        TransitionHandlerL().BeginUiUpdateLC();
         iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
             
@@ -351,7 +351,7 @@
             {
             SetTouchPaneButtons( EPhoneConferenceButtons );    
             }
-        EndUiUpdate();
+        TransitionHandlerL().EndUiUpdate();
         // CBA updates in above if-else conditions
         iStateMachine->ChangeState( EPhoneStateConference );
         }
@@ -376,7 +376,7 @@
 void CPhoneConferenceAndWaiting::HandleConferenceIdleL()
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleConferenceIdleL()");
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
     TPhoneCmdParamInteger activeCallCount;
@@ -449,7 +449,7 @@
           // come earlier than idle for conference member
            break;
         }
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     }
 
 // -----------------------------------------------------------
@@ -494,7 +494,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndWaiting::HandleWentOneToOneL()");
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     // Update conference bubble
     iViewCommandHandle->ExecuteCommandL(
@@ -523,7 +523,7 @@
         // Go to Conference And Single And Waiting state
         iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting );  
         }
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     }
 
 // End of File
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -297,7 +297,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndWaitingAndCallSetup::HandleConnectingL");
     
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     UpdateRemoteInfoDataL ( aCallId );
 
@@ -322,7 +322,7 @@
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
         }
     
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
         
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );    
     }
@@ -336,7 +336,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndWaitingAndCallSetup::HandleConnectedL");
     
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     UpdateRemoteInfoDataL ( aCallId );
     
@@ -358,7 +358,7 @@
     
     SetTouchPaneButtons( EPhoneWaitingCallButtons );    
     SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     
     // Go to Conference And Single And Waiting state
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );  
@@ -385,7 +385,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndWaitingAndCallSetup::HandleConferenceIdleL");
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
@@ -431,7 +431,7 @@
             iStateMachine->ChangeState( EPhoneStateCallSetupAndWaiting );
             }
         }
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     }
 
 // -----------------------------------------------------------
@@ -481,7 +481,7 @@
             }            
         else
             {
-            BeginUiUpdateLC();
+            TransitionHandlerL().BeginUiUpdateLC();
             TPhoneCmdParamCallStateData callStateData;
             callStateData.SetCallState( EPEStateRinging );
             iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState,
@@ -509,7 +509,7 @@
                 UpdateCbaL( EPhoneCallHandlingInCallCBA );                  
                 iStateMachine->ChangeState( EPhoneStateConferenceAndCallSetup );
                 }
-            EndUiUpdate();
+            TransitionHandlerL().EndUiUpdate();
             }
         }
     }
--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -445,7 +445,7 @@
     emergencyHeaderParam.SetCipheringIndicatorAllowed(
         iStateMachine->PhoneEngineInfo()->SecureSpecified() );
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
 
     // Notify the view
     iViewCommandHandle->ExecuteCommandL(
@@ -461,7 +461,7 @@
         aCallId,
         &headerParam );
 
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
 
     UpdateInCallCbaL();
     }
@@ -474,7 +474,7 @@
     {
     __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleConnectedL() ");
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
 
     TPhoneCmdParamCallHeaderData emergencyHeaderParam;
     emergencyHeaderParam.SetCallState( EPEStateConnected );
@@ -484,7 +484,7 @@
         aCallId,
         &emergencyHeaderParam );
 
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     SetToolbarDimming( ETrue );
     UpdateInCallCbaL();
     }
@@ -624,7 +624,7 @@
                     // Show not allowed note
                     SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed );
                     }
-                else
+                else if ( !iStateMachine->SecurityMode()->IsSecurityMode() )
                     {
                     // Logs to open
                     CallFromNumberEntryL();
--- a/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -21,6 +21,8 @@
 #include <telephonydomainpskeys.h>
 #include <UikonInternalPSKeys.h>
 #include <ccpdefs.h>
+#include <phoneui.rsg>
+#include <telephonyvariant.hrh>
 
 #include "phoneui.pan"
 #include "phonerssbase.h"
@@ -34,6 +36,7 @@
 #include "tphonecmdparamglobalnote.h"
 #include "tphonecmdparamnote.h"
 #include "cphonemainresourceresolver.h"
+#include "cphonecenrepproxy.h"
 
 
 // ================= MEMBER FUNCTIONS =======================
@@ -110,9 +113,32 @@
         TPhoneCmdParamGlobalNote globalNoteParam;
       
         globalNoteParam.SetType( EAknGlobalInformationNote );
-        globalNoteParam.SetTextResourceId( 
-            CPhoneMainResourceResolver::Instance()->
-            ResolveResourceID( aResourceId ) );
+        
+        if ( CPhoneCenRepProxy::Instance()->
+                IsTelephonyFeatureSupported( KTelephonyLVFlagClearCodeCustomization ) )
+            {
+			// Show varied note if clear code customization is enabled
+            TInt variedNote( KErrNotFound );
+            //Get varied resource
+            variedNote = ResourceVariation();
+            if ( variedNote != KErrNotFound )
+                {
+                globalNoteParam.SetTextResourceId( variedNote );
+                }
+            else
+                {
+				// If varied resource is not found, show original note.
+                globalNoteParam.SetTextResourceId( 
+                    CPhoneMainResourceResolver::Instance()->
+                    ResolveResourceID( aResourceId ) );
+                }
+            }
+        else
+            {
+            globalNoteParam.SetTextResourceId( 
+                CPhoneMainResourceResolver::Instance()->
+                ResolveResourceID( aResourceId ) );
+            }
         globalNoteParam.SetTone( EAvkonSIDInformationTone );
 
         iViewCommandHandle->ExecuteCommandL( 
@@ -143,9 +169,32 @@
             
         TPhoneCmdParamGlobalNote globalNoteParam;
         globalNoteParam.SetType( EAknGlobalErrorNote );
-        globalNoteParam.SetTextResourceId( 
-            CPhoneMainResourceResolver::Instance()->
-            ResolveResourceID( aResourceId ) );
+        
+        if (  CPhoneCenRepProxy::Instance()->
+                IsTelephonyFeatureSupported( KTelephonyLVFlagClearCodeCustomization ) )
+            {
+			// Show varied note if clear code customization is enabled
+            TInt variedNote( KErrNotFound );
+            //Get varied resource
+            variedNote = ResourceVariation();
+            if ( variedNote != KErrNotFound )
+                {
+                globalNoteParam.SetTextResourceId( variedNote );
+                }
+            else
+                {
+				// If varied resource is not found, show original note.
+                globalNoteParam.SetTextResourceId( 
+                    CPhoneMainResourceResolver::Instance()->
+                    ResolveResourceID( aResourceId ) );
+                }
+            }
+        else
+            {
+            globalNoteParam.SetTextResourceId( 
+                CPhoneMainResourceResolver::Instance()->
+                ResolveResourceID( aResourceId ) );
+            }
         globalNoteParam.SetTone( CAknNoteDialog::EErrorTone );
 
         iViewCommandHandle->ExecuteCommandL(  
@@ -176,9 +225,32 @@
             
         TPhoneCmdParamGlobalNote globalNoteParam;
         globalNoteParam.SetType( EAknGlobalWarningNote );
-        globalNoteParam.SetTextResourceId( 
-            CPhoneMainResourceResolver::Instance()->
-            ResolveResourceID( aResourceId ) );
+        
+        if ( CPhoneCenRepProxy::Instance()->
+                IsTelephonyFeatureSupported( KTelephonyLVFlagClearCodeCustomization ) )
+            {
+			// Show varied note if clear code customization is enabled
+            TInt variedNote( KErrNotFound );
+            //Get varied resource
+            variedNote = ResourceVariation();
+            if ( variedNote != KErrNotFound )
+                {
+                globalNoteParam.SetTextResourceId( variedNote );
+                }
+            else
+                {
+				// If varied resource is not found, show original note.
+                globalNoteParam.SetTextResourceId( 
+                    CPhoneMainResourceResolver::Instance()->
+                    ResolveResourceID( aResourceId ) );
+                }
+            }
+        else
+            {
+            globalNoteParam.SetTextResourceId( 
+                CPhoneMainResourceResolver::Instance()->
+                ResolveResourceID( aResourceId ) );
+            }
         globalNoteParam.SetTone( EAvkonSIDWarningTone );
 
         iViewCommandHandle->ExecuteCommandL( 
@@ -209,6 +281,7 @@
     __PHONELOG1( EBasic, EPhoneControl,
             "PhoneUIControl: CPhoneErrorMessagesHandler::ShowErrorSpecificNoteL - aErrorInfo.iErrorCode =%d ",
             aErrorInfo.iErrorCode);
+    iCallId = aErrorInfo.iCallId;
 
     switch( aErrorInfo.iErrorCode )
         {
@@ -497,7 +570,7 @@
         case ECCPErrorCCRecoveryOnTimerExpiry:        
             if( IsVideoCall( aErrorInfo.iCallId ) )
                 {
-                SendGlobalInfoNoteL( EPhoneNoteCallInfoNotSupported );                
+                SendGlobalInfoNoteL( EPhoneNoteCallInfoCauseValue16 );
                 }
             break;
             
@@ -567,6 +640,7 @@
                 aErrorInfo.iErrorCode);
             break;
         } 
+    iCallId = KErrNotFound;
     }    
 
 // -----------------------------------------------------------
@@ -607,4 +681,124 @@
             ->CallType( aCallId )== EPECallTypeCSVoice );
 	}
 
+// -----------------------------------------------------------------------------
+// CPhoneErrorMessagesHandler::ResourceVariation
+// -----------------------------------------------------------------------------
+TInt CPhoneErrorMessagesHandler::ResourceVariation() const
+    {
+    TInt resource( KErrNotFound );
+    
+    TInt callId = (KErrNotFound == iCallId) ? 
+        iStateMachine->PhoneEngineInfo()->CallId() :
+        iCallId;
+
+    //get exit code error from EngineInfo
+    TInt callError = iStateMachine->PhoneEngineInfo()->ProtocolError( callId );
+    
+    switch( callError )
+            {
+            case KErrGsmCCUnassignedNumber:
+                resource = R_NOTE_VAR_CAUSE_1;                
+                break;
+                
+            case KErrGsmCCNoRouteToDestination:
+                resource = R_NOTE_VAR_CAUSE_3;                
+                break;
+   
+            case KErrGsmCCOperatorDeterminedBarring:
+                resource = R_NOTE_VAR_CAUSE_8;                
+                break;
+                   
+            case KErrGsmCCUserBusy:
+                resource = R_NOTE_VAR_CAUSE_17;                
+                break;
+                
+            case KErrGsmCCUserNotResponding:
+                resource = R_NOTE_VAR_CAUSE_18;                
+                break;
+                
+            case KErrGsmCCCallRejected:
+                resource = R_NOTE_VAR_CAUSE_21;
+                break;
+                
+            case KErrGsmCCNumberChanged:
+                resource = R_NOTE_VAR_CAUSE_22;
+                break;
+                
+            case KErrGsmCCDestinationOutOfOrder:
+                resource = R_NOTE_VAR_CAUSE_27;
+                break;
+
+            case KErrGsmCCFacilityRejected:
+                resource = R_NOTE_VAR_CAUSE_29;                
+                break;
+                
+            case KErrGsmCCNetworkOutOfOrder:
+                resource = R_NOTE_VAR_CAUSE_38;                
+                break;
+                
+            case KErrGsmCCTemporaryFailure:
+                resource = R_NOTE_VAR_CAUSE_41;                
+                break;
+                
+            case KErrGsmCCSwitchingEquipmentCongestion:
+                resource = R_NOTE_VAR_CAUSE_42;                
+                break;
+                
+            case KErrGsmCCAccessInformationDiscarded:
+                resource = R_NOTE_VAR_CAUSE_43;                
+                break;
+                
+            case KErrGsmCCRequestedChannelNotAvailable:
+                resource = R_NOTE_VAR_CAUSE_44;                
+                break;
+                
+            case KErrGsmCCResourceNotAvailable:
+                resource = R_NOTE_VAR_CAUSE_47;                
+                break;
+                
+            case KErrGsmCCIncomingCallsBarredInCug:
+                resource = R_NOTE_VAR_CAUSE_55;                
+                break;
+                
+            case KErrGsmCCBearerCapabilityNotAuthorised:
+                resource = R_NOTE_VAR_CAUSE_57;                
+                break;
+                
+            case KErrGsmCCServiceNotAvailable:
+                resource = R_NOTE_VAR_CAUSE_63;                
+                break;
+                
+            case KErrGsmCCBearerServiceNotImplemented:
+                resource = R_NOTE_VAR_CAUSE_65;                
+                break;
+                
+            case KErrGsmCCRequestedFacilityNotImplemented:
+                resource = R_NOTE_VAR_CAUSE_69;                
+                break;
+                
+            case KErrGsmCCUserNotInCug:
+                resource = R_NOTE_VAR_CAUSE_87;                
+                break;
+                
+            case KErrGsmCCIncompatibleDestination:
+                resource = R_NOTE_VAR_CAUSE_88;                
+                break;
+                
+            case KErrGsmCCSemanticallyIncorrectMessage:
+                resource = R_NOTE_VAR_CAUSE_95;                
+                break;
+                
+            case KErrGsmCCUnspecifiedProtocolError:
+                resource = R_NOTE_VAR_CAUSE_111;                
+                break;
+                
+            case KErrGsmCCUnspecifiedInterworkingError:
+                resource = R_NOTE_VAR_CAUSE_127;
+                break;
+            default:
+                break;
+            }  
+    return resource;
+    }
 // End of File
--- a/phoneapp/phoneuistates/src/cphoneincoming.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneincoming.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -165,9 +165,9 @@
                
                // Prevent execution of CPhoneStateIncoming::HandleIdleL, only remove
                // the call bubble
-               BeginUiUpdateLC();
+               TransitionHandlerL().BeginUiUpdateLC();
                iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
-               EndUiUpdate();
+               TransitionHandlerL().EndUiUpdate();
 
                iWaitingCallId = KErrNotFound;
                }
@@ -193,16 +193,12 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneIncoming::HandleIncomingL()");
-    
     TPhoneCmdParamCallStateData callState;
     callState.SetCallState( EPEStateConnected );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCallIdByState, &callState );
     TInt connectedCall = callState.CallId(); 
     
-    IsNumberEntryUsedL() ? 
-        BeginTransEffectLC( ECallUiAppear ) :
-        BeginTransEffectLC( ENumberEntryOpen );
-    BeginUiUpdateLC();
+    TransitionHandlerL().IncomingCallUiUpdateLC();
     
     // Hide the number entry if it exists
     if ( IsNumberEntryUsedL() )
@@ -212,7 +208,6 @@
     
     TPhoneCmdParamBoolean dialerParam;
     dialerParam.SetBoolean( ETrue );
-    
     AllowShowingOfWaitingCallHeaderL( dialerParam );
       
     // Close fast swap window if it's displayed
@@ -235,11 +230,8 @@
         }
     
     SetToolbarDimming( EFalse );
-    // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam );
-
-    EndUiUpdate();
-    EndTransEffect();
+    TransitionHandlerL().EndUiUpdateAndEffect();
 
     if ( connectedCall > KErrNotFound )
         {
--- a/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -196,7 +196,7 @@
         // Close menu bar, if it is displayed
         iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
 
-        CPhoneState::BeginUiUpdateLC();
+        TransitionHandlerL().BeginUiUpdateLC();
             
         // Show bubble
         TPhoneCmdParamCallHeaderData callHeaderParam;
@@ -205,7 +205,7 @@
             &callHeaderParam );
 
         SetTouchPaneButtons( EPhoneTwoSinglesButtons );
-        EndUiUpdate();
+        TransitionHandlerL().EndUiUpdate();
               
         // Set Hold flag to view
         TPhoneCmdParamBoolean holdFlag;
@@ -240,8 +240,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneSingleAndAlerting::HandleIdleL()");
-    
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     // Remove call 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
@@ -277,8 +276,7 @@
         UpdateCbaL( EPhoneCallHandlingInCallCBA );
         iStateMachine->ChangeState( EPhoneStateAlerting );
         }
-
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     }
 
 // -----------------------------------------------------------
--- a/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -204,7 +204,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetup::HandleConnectingL()");
     
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     UpdateRemoteInfoDataL ( aCallId );
     
@@ -230,7 +230,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
 
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
         
     // Set Hold flag to view EFalse that dtmf menu item not delete
     TPhoneCmdParamBoolean holdFlag;
@@ -251,7 +251,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneSingleAndCallSetup::HandleConnectedL()");
     
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     // Show bubble
     TPhoneCmdParamCallHeaderData callHeaderParam;
@@ -276,9 +276,8 @@
 
     SetTouchPaneButtons( EPhoneTwoSinglesButtons );
     
-    EndUiUpdate();        
+    TransitionHandlerL().EndUiUpdate();
     
-     // Go to two singles state
     UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
     iStateMachine->ChangeState( EPhoneStateTwoSingles );
     
@@ -291,7 +290,7 @@
 void CPhoneSingleAndCallSetup::HandleIdleL( TInt aCallId )
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndCallSetup::HandleIdleL()");
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
     // Find out do we have single or outgoing call left
@@ -329,7 +328,7 @@
         UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
         iStateMachine->ChangeState( EPhoneStateCallSetup );
         }
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     }
 
 // -----------------------------------------------------------
--- a/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -428,7 +428,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
         &globalNotifierParam );
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
 
     // Update bubble content
     UpdateRemoteInfoDataL( aCallId );
@@ -439,7 +439,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
         
-    EndUiUpdate();                
+    TransitionHandlerL().EndUiUpdate();
 
     // Set call waiting cba
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
@@ -507,15 +507,13 @@
     holdFlag.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );       
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     SetTouchPaneButtons( EPhoneCallSetupButtons );
     SetToolbarDimming( ETrue );
     SetToolbarButtonLoudspeakerEnabled();
     
-    EndUiUpdate();
-    
-    // Go to Call Setup And Waiting state
+    TransitionHandlerL().EndUiUpdate();
     // No need to update cbas
     iStateMachine->ChangeState( EPhoneStateCallSetupAndWaiting );
     }
@@ -548,12 +546,11 @@
     holdFlag.SetBoolean( ETrue );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
     
-    EndUiUpdate();
-    // Go to Single And Waiting state  
+    TransitionHandlerL().EndUiUpdate();
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );  
     iStateMachine->ChangeState( EPhoneStateWaitingInSingle );        
     }
@@ -582,13 +579,12 @@
     holdFlag.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     SetTouchPaneButtons( EPhoneCallSetupButtons );
     
-    EndUiUpdate();
-	// Go to Single And Alerting state
-	UpdateCbaL( EPhoneCallHandlingInCallCBA );
+    TransitionHandlerL().EndUiUpdate();
+    UpdateCbaL( EPhoneCallHandlingInCallCBA );
     iStateMachine->ChangeState( EPhoneStateAlertingInSingle );        
     }
 
@@ -600,15 +596,13 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
 	    "CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL()");
-
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
     SetTouchPaneButtons( EPhoneTwoSinglesButtons );
     
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
 
-    // Go to two singles state 
     UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
     iStateMachine->ChangeState( EPhoneStateTwoSingles );                     
     }
@@ -622,12 +616,12 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
 	    "CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL()");
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
     SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
     
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
 
     // Go to two singles state and waiting
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
--- a/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -372,7 +372,7 @@
     if( iSingleCallId == aCallId )
         {
         // Idle message came for active call
-        BeginUiUpdateLC();
+        TransitionHandlerL().BeginUiUpdateLC();
 
         // Remove call
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
@@ -423,14 +423,14 @@
             // Play ringtone
             SetRingingTonePlaybackL( callStateData.CallId() );
             }
-        EndUiUpdate();
+        TransitionHandlerL().EndUiUpdate();
         SetToolbarDimming( ETrue );
 
         iStateMachine->ChangeState( EPhoneStateIncoming );
         }
     else
         {
-        BeginUiUpdateLC();
+        TransitionHandlerL().BeginUiUpdateLC();
 
         // Remove call
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
@@ -473,7 +473,7 @@
             }
         
         SetTouchPaneButtons( EPhoneIncallButtons );
-        EndUiUpdate();
+        TransitionHandlerL().EndUiUpdate();
         // CBA updates in above if-else conditions
         iStateMachine->ChangeState( EPhoneStateSingle );
         }
@@ -583,7 +583,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL() ");
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     UpdateRemoteInfoDataL ( aCallId );
     // Show bubble
     TPhoneCmdParamCallHeaderData callHeaderParam;
@@ -618,7 +618,7 @@
         }
     
     SetTouchPaneButtons( EPhoneTwoSinglesButtons );
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     // CBA updates in above if-else conditions
     iStateMachine->ChangeState( EPhoneStateTwoSingles );
     }
--- a/phoneapp/phoneuistates/src/cphonesinglecall.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonesinglecall.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -497,15 +497,11 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneSingleCall::HandleIncomingL()");
-    
     CPhonePubSubProxy::Instance()->ChangePropertyValue(
                     KPSUidScreenSaver,
                     KScreenSaverAllowScreenSaver,
                     EPhoneScreensaverNotAllowed );
-    IsNumberEntryUsedL() ? 
-        BeginTransEffectLC( ECallUiAppear ) :
-        BeginTransEffectLC( ENumberEntryOpen );
-    BeginUiUpdateLC();
+    TransitionHandlerL().IncomingCallUiUpdateLC();
     
     // Hide the number entry if it exists
     if ( IsNumberEntryUsedL() )
@@ -513,23 +509,20 @@
         SetNumberEntryVisibilityL( EFalse );    
         }
     
+    // Get allow waiting call header param value.
     TPhoneCmdParamBoolean dialerParam;
     dialerParam.SetBoolean( ETrue );
-    
-    // Get allow waiting call header param value.
     AllowShowingOfWaitingCallHeaderL( dialerParam );    
 
     // Close fast swap window if it's displayed
     EikonEnv()->DismissTaskList();
 
     // Show incoming call buttons
-    SetTouchPaneButtons( EPhoneWaitingCallButtons );    
-
-    // Display incoming call
+    SetTouchPaneButtons( EPhoneWaitingCallButtons );
+    
     DisplayIncomingCallL( aCallId, dialerParam );
-
-    EndUiUpdate();
-    EndTransEffect();
+    TransitionHandlerL().EndUiUpdateAndEffect();
+    
     // This query is required to dismiss
     // Operation cannot be completed in waiting and single state
     if ( iSwitchToVideoQuery )
--- a/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -195,7 +195,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneTwoSingles::HandleIdleL()");
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
 
     // Remove call 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
@@ -245,7 +245,7 @@
         default:
             break;
         }
-    EndUiUpdate(); 
+    TransitionHandlerL().EndUiUpdate(); 
     }
 
 // -----------------------------------------------------------
@@ -355,7 +355,7 @@
         callLabelId, 
         CCoeEnv::Static() );
     callHeaderParam.SetCLIText( conferenceText, CBubbleManager::ERight );
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     callHeaderParam.SetCiphering(
         iStateMachine->PhoneEngineInfo()->IsSecureCall( aCallId ) );
@@ -378,11 +378,9 @@
 
     SetTouchPaneButtons( EPhoneConferenceButtons );
     SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     
     UpdateCbaL( EPhoneCallHandlingInCallCBA );
-    
-    // Go to conference state
     // No need for CBA update
     iStateMachine->ChangeState( EPhoneStateConference );
     }
@@ -394,17 +392,12 @@
 void CPhoneTwoSingles::HandleIncomingL( TInt aCallId )
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
-        "CPhoneTwoSingles::HandleIncomingL()");
-    
+            "CPhoneTwoSingles::HandleIncomingL()");
     CPhonePubSubProxy::Instance()->ChangePropertyValue(
                     KPSUidScreenSaver,
                     KScreenSaverAllowScreenSaver,
                     EPhoneScreensaverNotAllowed );
-    
-    IsNumberEntryUsedL() ? 
-        BeginTransEffectLC( ECallUiAppear ) :
-        BeginTransEffectLC( ENumberEntryOpen );
-    BeginUiUpdateLC();
+    TransitionHandlerL().IncomingCallUiUpdateLC();
     
     // Hide the number entry if it exists
     if ( IsNumberEntryUsedL() )
@@ -412,27 +405,22 @@
         SetNumberEntryVisibilityL( EFalse );    
         }
     
+    // Get allow waiting call header param value.
     TPhoneCmdParamBoolean dialerParam;
     dialerParam.SetBoolean( ETrue );
-    
-    // Get allow waiting call header param value.
     AllowShowingOfWaitingCallHeaderL( dialerParam );
     
     // Close fast swap window if it's displayed
     EikonEnv()->DismissTaskList();
 
-    // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam );
     
     // Set touch controls
     SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
-    
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
 
-    EndUiUpdate();
-    EndTransEffect();
+    TransitionHandlerL().EndUiUpdateAndEffect();
 
-    // Go to incoming state
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
     iStateMachine->ChangeState( EPhoneStateTwoSinglesAndWaiting );        
     }
--- a/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -217,7 +217,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneTwoSinglesAndWaiting::HandleIdleL()");
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     if ( !IsNumberEntryUsedL() )
         {
         iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); 
@@ -232,7 +232,7 @@
         {
         StateTransitionToSingleAndWaitingL();
         }
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     }
 
 // -----------------------------------------------------------
@@ -309,7 +309,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneTwoSinglesAndWaiting::HandleConnectedConferenceL()");
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     // Update call state
     TPhoneCmdParamCallHeaderData callHeaderParam;
 
@@ -345,10 +345,9 @@
         
     SetNeedToReturnToForegroundAppStatusL( EFalse );
         
-    EndUiUpdate();
-    // Go to Conference And Waiting state
+    TransitionHandlerL().EndUiUpdate();
     // No need for CBA update
-    iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting );                
+    iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting );
     }
     
 // -----------------------------------------------------------
--- a/phoneapp/phoneuiutils/inc/cphoneresourceresolverbase.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuiutils/inc/cphoneresourceresolverbase.h	Tue Sep 14 21:18:17 2010 +0300
@@ -73,13 +73,23 @@
         IMPORT_C CPhoneResourceResolverBase();
         
         /**
-        * Checkes whether a certain feature is on / or not.
+        * Checks whether a certain feature is on / or not.
         * @param aFeatureId
         * @return TBool supported /not supported
         */ 
         IMPORT_C virtual TBool IsTelephonyFeatureSupported( TInt aFeatureId ) const;
+
+    private:
+        /**
+        * Checks whether the Video Share button should be shown,
+        * i.e., if the appropriate feature flag is enabled *and*
+        * Video Sharing is currently available
+        * @param None
+        * @return TBool show / don't show
+        */
+        TBool ShowVideoShareButton() const;
     
-   protected:
+    protected:
        TInt iResourceOffset;     
 
     private:
@@ -90,8 +100,10 @@
             EOnscreenDialer = 1,
             //Flag to indicate whether on touch call handling is supported.
             ETouchCallHandling = 2,
-            //Flag to indicate whether videocallmenu is supported.
-            EVideoCallMenu = 4
+            //Flag to indicate whether video call menu is supported.
+            EVideoCallMenu = 4,
+            //Flag to indicate whether entry point for video share is supported.
+            EVideoShareEntryPoint = 8
             };
         TInt iVariationFlags;
 		
--- a/phoneapp/phoneuiutils/inc/tphonecmdparamtranseffect.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuiutils/inc/tphonecmdparamtranseffect.h	Tue Sep 14 21:18:17 2010 +0300
@@ -37,17 +37,17 @@
 enum TPhoneTransEffectType
     {
     EPhoneTransEffectNone,
+    /* These two effects are for internal transitions(CallUi <-> Dialer) */
     EPhoneTransEffectCallUiAppear,
     EPhoneTransEffectCallUiDisappear,
-    // These 3 effect types can be used only when dialer is
-    // opened/closed when some other app than phone is visible 
-    // on the foreground/in the background.
-    // These cannot be used for internal transitions (=call ui<->dialer).
-    EPhoneTransEffectDialerOpen,
-    EPhoneTransEffectDialerClose,
+    /* These two effect types can be used only when CallUi or Dialer is 
+    opened/closed from some other app. These cannot be used for 
+    internal transitions between CallUi<->Dialer.*/
+    EPhoneTransEffectPhoneUiOpen,
+    EPhoneTransEffectPhoneUiClose,
     EPhoneTransEffectDialerCreate,
-    // For applying effect to external app launch done from dialer.
-    // Effects triggered by App FW don't work properly.
+    /* For applying effect to external app launch done from dialer.
+    Effects triggered by App FW don't work properly.*/
     EPhoneTransEffectAppStartFromDialer,
     EPhoneTransEffectStop
     };
--- a/phoneapp/phoneuiutils/inc/tphonecommandparam.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuiutils/inc/tphonecommandparam.h	Tue Sep 14 21:18:17 2010 +0300
@@ -102,6 +102,7 @@
         EPhoneParamIdGlobalWaitNote,
         EPhoneNumberEntryObserver,
         EPhoneParamIdPointer,
+        EPhoneParamIdEffect,
         // Add new params before this
         EPhoneParamIdLast
         };
--- a/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -22,6 +22,7 @@
 #include <avkon.rsg>
 #include <featmgr.h>
 #include <telephonyvariant.hrh>
+#include <coreapplicationuisdomainpskeys.h>
 
 #include "phoneui.pan"
 #include "cphoneresourceresolverbase.h"
@@ -30,6 +31,7 @@
 #include "phonerssbase.h"
 #include "phonelogger.h"
 #include "cphonecenrepproxy.h"
+#include "cphonepubsubproxy.h"
 
 #include <phoneui.rsg>
 #include <callhandlingui.rsg>
@@ -63,6 +65,11 @@
         {
         iVariationFlags |= EVideoCallMenu;
         }
+
+    if ( FeatureManager::FeatureSupported( KFeatureIdFfEntryPointForVideoShare ) )
+        {
+        iVariationFlags |= EVideoShareEntryPoint;
+        }
     }
 
 // Destructor
@@ -119,6 +126,15 @@
     {
     return CPhoneCenRepProxy::Instance()->IsTelephonyFeatureSupported( aFeatureId );
     }
+
+TBool CPhoneResourceResolverBase::ShowVideoShareButton() const
+    {
+    return ( iVariationFlags & EVideoShareEntryPoint ) &&
+           CPhonePubSubProxy::Instance()->Value
+              ( KPSUidCoreApplicationUIs, KCoreAppUIsVideoSharingIndicator )
+                 == ECoreAppUIsVideoSharingIndicatorOn;
+    }
+
 // -----------------------------------------------------------------------------
 // CPhoneResourceResolverBase::ResolveResourceID
 // Empty implementation, because there isn't common phoneapp.rss file.
@@ -1363,7 +1379,14 @@
             break;
 
         case EPhoneIncallButtons:
-            retVal = R_PHONEUI_INCALL_BUTTONS;
+            if ( ShowVideoShareButton() )
+                {
+                retVal = R_PHONEUI_INCALL_VIDEO_SHARE_BUTTONS;
+                }
+            else
+                {
+                retVal = R_PHONEUI_INCALL_BUTTONS;
+                }
             break;
 
         case EPhoneIncallVideoShareButtons:
--- a/phoneapp/phoneuiutils/src/tphonecmdparamtranseffect.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuiutils/src/tphonecmdparamtranseffect.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -32,6 +32,7 @@
     iType( EPhoneTransEffectNone ),
     iAppUid( KNullUid )
     {
+    iParamId = EPhoneParamIdEffect;
     }
 
 // ---------------------------------------------------------
--- a/phoneapp/phoneuiview/inc/c3dringingtoneinterface.inl	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuiview/inc/c3dringingtoneinterface.inl	Tue Sep 14 21:18:17 2010 +0300
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include    <ECom/ECom.h>
+#include    <ecom/ecom.h>
 
 // CONSTANTS
 _LIT8( KCoUtlResolverData, "default" );
--- a/phoneapp/phoneuiview/src/cphonebubblewrapper.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuiview/src/cphonebubblewrapper.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -1394,9 +1394,9 @@
             RemoveConferenceL();
             }
 
-	    iBubbleManager->RemoveCallHeader( bubble );
-	    iMapping->RemoveFromMapping( aCallId );
-	    iBubbleManager->EndChanges();
+        iBubbleManager->RemoveCallHeader( bubble );
+        iMapping->RemoveFromMapping( aCallId );
+        iBubbleManager->EndChanges();
         }
     }
 
--- a/phoneapp/phoneuiview/src/cphoneviewcontroller.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuiview/src/cphoneviewcontroller.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -140,8 +140,8 @@
 
 // Kastor effect IDs, aknskincontent/101f84b9.sel
 // These effects cannot be used for internal transitions (Call UI<->Dialer)
-const TInt KTouchDialerOpenEffect  = 3;
-const TInt KTouchDialerCloseEffect = 5;
+const TInt KTouchPhoneUiOpenEffect  = 3;
+const TInt KTouchPhoneUiCloseEffect = 5;
 
 const TInt KTouchCallUiOpenEffect  = 1000;
 const TInt KTouchCallUiCloseEffect = 1001;
@@ -3849,11 +3849,11 @@
     switch ( aType )
         {
         case EPhoneTransEffectDialerCreate:
-        case EPhoneTransEffectDialerOpen:
-            useEffect = KTouchDialerOpenEffect;
+        case EPhoneTransEffectPhoneUiOpen:
+            useEffect = KTouchPhoneUiOpenEffect;
             break;
-        case EPhoneTransEffectDialerClose:
-            useEffect = KTouchDialerCloseEffect;
+        case EPhoneTransEffectPhoneUiClose:
+            useEffect = KTouchPhoneUiCloseEffect;
             break;
         case EPhoneTransEffectAppStartFromDialer:
             useEffect = AknTransEffect::EApplicationStart;
@@ -4126,7 +4126,7 @@
     /* In case transition is from idle to dialer or to incoming call 
     show transition effects as well. */
     else if ( isIdleInForeground && 
-              ( aType == EPhoneTransEffectDialerOpen ||
+              ( aType == EPhoneTransEffectPhoneUiOpen ||
                 aType == EPhoneTransEffectCallUiAppear ) )
         {
         okToUseEffect = ETrue;
@@ -4135,7 +4135,7 @@
     when call is created from some other then phone app for example logs or from phonebook*/
     else if ( !isPhoneForeground && 
               !isIdleInForeground && 
-              ( aType == EPhoneTransEffectDialerOpen ||
+              ( aType == EPhoneTransEffectPhoneUiOpen ||
                 aType == EPhoneTransEffectCallUiAppear ) )
         {
         okToUseEffect = ETrue;
@@ -4154,7 +4154,7 @@
     switch ( aType )
         {
         case EPhoneTransEffectDialerCreate:
-        case EPhoneTransEffectDialerOpen:
+        case EPhoneTransEffectPhoneUiOpen:
             okToUse = !iDialerActive;
             break;
         case EPhoneTransEffectAppStartFromDialer:
@@ -4162,7 +4162,7 @@
             break;
         /* No need to check dialer activity below because effects are 
         common to callhandling/dialer */
-        case EPhoneTransEffectDialerClose:
+        case EPhoneTransEffectPhoneUiClose:
         case EPhoneTransEffectCallUiAppear:
         case EPhoneTransEffectCallUiDisappear:
             okToUse = ETrue;
--- a/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuivoipextension/src/cphonecustomizationvoip.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -851,8 +851,6 @@
 
     HBufC* phoneNumber = PhoneNumberFromEntryLC();
 
-    TInt index(KErrNotFound);
-
     // If number entry is empty don't add internet call option 
     if ( phoneNumber->Length() )
         {
--- a/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -198,9 +198,11 @@
             &customDialerParam );
         
         // Open transfer dialer
-        phoneState->BeginTransEffectLC( ECallUiDisappear );
+        phoneState->
+            TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectCallUiDisappear );
         iViewCommandHandle.ExecuteCommandL( EPhoneViewCreateNumberEntry );
-        phoneState->EndTransEffect();
+        phoneState->
+            TransitionHandlerL().EndTransEffect();
         
         // Update CBA to transfer dialer CBA
         TPhoneCmdParamInteger resourceId;
--- a/phoneapp/silenceactionplugin/data/silenceringingtone_activate.rul	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/silenceactionplugin/data/silenceringingtone_activate.rul	Tue Sep 14 21:18:17 2010 +0300
@@ -12,7 +12,10 @@
             </notEqual>
         </or>
         <actions>
-            <!-- do nothing -->
+            <!-- Publish context that indicates that silence ringing tone is not active -->
+            <publishContext define='true'>
+                <contextRef source='Feature' type='SilenceRingingTone.Active' value='false'/>
+            </publishContext>
         </actions>
     </if>
 
--- a/phoneengine/contacthandling/inc/cpecontactextensionwrapper.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/contacthandling/inc/cpecontactextensionwrapper.h	Tue Sep 14 21:18:17 2010 +0300
@@ -74,7 +74,10 @@
     * From CTelMatchingExtension.
     * @see CTelMatchingExtension.
     */
-    TInt GetAddressForMatching( RBuf& aParsedAddress, TInt& aMeaningfulDigits );
+    TInt GetAddressForMatching( 
+        RBuf& aParsedAddress, 
+        TInt& aMeaningfulDigits, 
+        TBool& aAllowUserNameMatch );
 
     /**
     * From CTelMatchingExtension.
--- a/phoneengine/contacthandling/src/cpecontactextensionwrapper.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/contacthandling/src/cpecontactextensionwrapper.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -117,9 +117,12 @@
 // ---------------------------------------------------------------------------
 //
 TInt CPEContactExtensionWrapper::GetAddressForMatching( 
-        RBuf& aParsedAddress, TInt& aMeaningfulDigits )
+        RBuf& aParsedAddress, 
+        TInt& aMeaningfulDigits, 
+        TBool& aAllowUserNameMatch )
     {
-    return iPlugin->GetAddressForMatching( aParsedAddress, aMeaningfulDigits );
+    return iPlugin->GetAddressForMatching( 
+            aParsedAddress, aMeaningfulDigits, aAllowUserNameMatch );
     }
 
 
--- a/phoneengine/contacthandling/src/cpecontactmatch.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/contacthandling/src/cpecontactmatch.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -691,8 +691,10 @@
     RBuf parsedAddress;
     CleanupClosePushL( parsedAddress );
     TInt digitsformatching( 0 );
-    User::LeaveIfError( plugin.GetAddressForMatching( parsedAddress, digitsformatching ) );
-
+    TBool allowUserNameMatch( EFalse );
+    User::LeaveIfError( plugin.GetAddressForMatching( 
+            parsedAddress, digitsformatching, allowUserNameMatch ) );
+			
     CDesCArray* array = new ( ELeave ) CDesC16ArrayFlat( 1 );
     CleanupStack::PushL( array );
     User::LeaveIfError( plugin.GetContactStoreUris( *array ) );
@@ -704,17 +706,20 @@
     
     // Digits for matching. Supported range is between 4-20.
     // If not valid value use whole address length for matching.
-    digitsformatching = ( digitsformatching < KMinValueOfMeaningfulDigits || 
-                          digitsformatching > KMaxValueOfMeaningfulDigits ) ? 
-                          parsedAddress.Length() : digitsformatching;
-    
+    if ( digitsformatching != 0 && 
+         ( digitsformatching < KMinValueOfMeaningfulDigits ||
+           digitsformatching > KMaxValueOfMeaningfulDigits ) )
+        {
+        digitsformatching = parsedAddress.Length();
+        }
+		
     // Use service specific parameters for matching.
     TEFLOGSTRING3( KTAINT, "CNT MatchWithVoipAddressUsingExtensionL >\
         CPhCntMatcher::MatchVoipNumber, NUMBER: %S, CALL ID: %d",
         &remoteNumber, aCallId )
     iContactMatcher->MatchVoipNumber( aMatch, 
         parsedAddress.Left( Min( parsedAddress.Length(), KPEPhoneNumberMaxLength ) ), 
-        ETrue, array, digitsformatching );                                       
+        allowUserNameMatch, array, digitsformatching );                                       
     
     CleanupStack::PopAndDestroy( array );
     CleanupStack::PopAndDestroy( &parsedAddress );
--- a/phoneengine/engineinfo/inc/cpecallinfo.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/engineinfo/inc/cpecallinfo.h	Tue Sep 14 21:18:17 2010 +0300
@@ -474,6 +474,16 @@
      * Returns transfer call back flag.
      */
     TBool DoCallBackRequest() const;
+    
+    /**
+     * Sets protocol spesific error code
+     */
+    void SetProtocolError( TInt aError );
+    
+    /**
+     * Gets protocol spesific error code
+     */
+    TInt ProtocolError() const;
 
 private:
     
@@ -649,6 +659,11 @@
      * Flag which indicates if call back request is needed
      */
     TBool iDoCallBackRequest;
+    
+    /**
+     * Protocol specific error
+     */
+    TInt iProtocolSpesificErrorCode;
     };
 
 #endif // C_CPECALLINFO_H
--- a/phoneengine/engineinfo/inc/cpeengineinfoimpl.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/engineinfo/inc/cpeengineinfoimpl.h	Tue Sep 14 21:18:17 2010 +0300
@@ -647,6 +647,20 @@
           * @see MPEEngineInfo::CallBackAddress
           */
           const TDesC& CallBackAddress() const;
+          
+          /**
+          * Sets the protocol spesific error code
+          * @param aError is the error code from Etel.
+          * @return None.
+          */
+          void SetProtocolError( TInt aError, TInt aCallId ); 
+           
+          /**
+          * Gets the protocol spesific error code
+          * @param aCallId is the call identification number.
+          * @return TInt.
+          */
+          TInt ProtocolError( const TInt aCallId ) const; 
 
     // Functions from MPEDataStore (reading values)
     public:
--- a/phoneengine/engineinfo/inc/mpeengineinfo.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/engineinfo/inc/mpeengineinfo.h	Tue Sep 14 21:18:17 2010 +0300
@@ -720,6 +720,20 @@
          */
         virtual const TDesC& CallBackAddress() const = 0;
         
+        /**
+        * Sets the protocol spesific error code
+        * @param aError is the error code from Etel.
+        * @return None.
+        */
+        virtual void SetProtocolError( TInt aError, TInt aCallId ) = 0; 
+        
+        /**
+        * Gets the protocol spesific error code
+        * @param aCallId is the call identification number.
+        * @return TInt.
+        */
+        virtual TInt ProtocolError( const TInt aCallId ) const = 0; 
+        
     }; // MPEEngineInfo
     
 #endif      //MPEENGINEINFO_H
--- a/phoneengine/engineinfo/src/cpecallinfo.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/engineinfo/src/cpecallinfo.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -107,6 +107,7 @@
     iForwardAddressChoices = NULL;
     iCallIndex = KPEInvalidCallIndex;
     iDoCallBackRequest = EFalse;
+    iProtocolSpesificErrorCode = KErrNone;
     }
 
 // ---------------------------------------------------------------------------
@@ -668,6 +669,22 @@
     {
     return iDoCallBackRequest;
     }
-    
    
+// ---------------------------------------------------------------------------
+// Sets protocol spesific error code
+// ---------------------------------------------------------------------------
+//
+void CPECallInfo::SetProtocolError( TInt aError )
+    {
+    iProtocolSpesificErrorCode = aError;
+    }
+
+// ---------------------------------------------------------------------------
+// Gets protocol spesific error code
+// ---------------------------------------------------------------------------
+//
+TInt CPECallInfo::ProtocolError() const
+    {
+    return iProtocolSpesificErrorCode;
+    }
 // End of File
--- a/phoneengine/engineinfo/src/cpeengineinfoimpl.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/engineinfo/src/cpeengineinfoimpl.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -2680,4 +2680,24 @@
     return stateExists;
     }
 
+// -----------------------------------------------------------------------------
+// CPEEngineInfoImpl::SetProtocolError
+// Sets the protocol spesific error code to callinfo
+// -----------------------------------------------------------------------------
+//
+void CPEEngineInfoImpl::SetProtocolError( TInt aError, TInt aCallId )
+    {
+    iCurrentCalls[ aCallId ]->SetProtocolError( aError );
+    }
+
+// -----------------------------------------------------------------------------
+// CPEEngineInfoImpl::ProtocolError
+// Gets the protocol spesific error code from callinfo
+// -----------------------------------------------------------------------------
+//
+TInt CPEEngineInfoImpl::ProtocolError( const TInt aCallId ) const
+    {
+    return iCurrentCalls[ aCallId ]->ProtocolError();
+    }
+	
 // End of File
Binary file phoneengine/phonemodel/cenrep/keys_s60telephony.xls has changed
Binary file phoneengine/phonemodel/conf/s60telephony.confml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_101F87E3.crml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102828F8.crml has changed
--- a/phoneengine/phonemodel/group/bld.inf	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/phonemodel/group/bld.inf	Tue Sep 14 21:18:17 2010 +0300
@@ -42,6 +42,9 @@
 backup_registration.xml /epoc32/data/z/private/1000a86c/backup_registration.xml
 backup_registration.xml /epoc32/release/winscw/udeb/z/private/1000a86c/backup_registration.xml
 backup_registration.xml /epoc32/release/winscw/urel/z/private/1000a86c/backup_registration.xml
+backup_registration.xml /epoc32/data/z/private/100058b3/backup_registration.xml
+backup_registration.xml /epoc32/release/winscw/udeb/z/private/100058b3/backup_registration.xml
+backup_registration.xml /epoc32/release/winscw/urel/z/private/100058b3/backup_registration.xml
 
 // SIS stubs
 ../data/phonemodel_stub.sis         /epoc32/data/z/system/install/phonemodel_stub.sis
--- a/phoneengine/phonemodel/inc/cpephonemodel.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/phonemodel/inc/cpephonemodel.h	Tue Sep 14 21:18:17 2010 +0300
@@ -119,6 +119,11 @@
         * Constructs Contact Handling Phase Two
         */           
         void ConstructContactHandlingPhaseTwoL();
+        
+       /**
+         * Gets call error from callinfo
+         */ 
+        void SetCallError( TInt aCallId );
 
 // Functions from CPEPhonemodelIF
 
@@ -321,6 +326,9 @@
         
         // Mediator command handler
         CPERemotePartyInfoMediator* iMediatorCommunicationHandler;
+        
+        // Mobile call info.
+        RMobileCall::TMobileCallInfoV3* iCallInfo;
 
     };
 
--- a/phoneengine/phonemodel/inc/telephonyvariant.hrh	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/phonemodel/inc/telephonyvariant.hrh	Tue Sep 14 21:18:17 2010 +0300
@@ -96,6 +96,13 @@
 #define KTelephonyLVFlagAdvancedENCheck 0x00000200
 
 /**
+* Clear Code Customization
+* When the flag is set, different notes are shown if call fails.
+* Requrement id: 414-7525.
+*/
+#define KTelephonyLVFlagClearCodeCustomization 0x00000400
+
+/**
 * KTelephonyLVFlagArbitraryVideoScaling defines if video player
 * implementation in the device support arbitrary scaling.
 * When the flag is set, arbitrary scaling is applied.
--- a/phoneengine/phonemodel/rom/phonengengine.iby	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/phonemodel/rom/phonengengine.iby	Tue Sep 14 21:18:17 2010 +0300
@@ -44,7 +44,7 @@
 file=ABI_DIR\BUILD_DIR\peservicehandling.dll      SHARED_LIB_DIR\peservicehandling.dll
 
 data=DATAZ_\private\1000A86C\backup_registration.xml  private\1000A86C\backup_registration.xml
-
+data=DATAZ_\private\100058B3\backup_registration.xml  private\100058B3\backup_registration.xml
 
 // SIS stubs
 data=ZSYSTEM\install\audiohandling_stub.sis     System\Install\audiohandling_stub.sis
--- a/phoneengine/phonemodel/src/cpephonemodel.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneengine/phonemodel/src/cpephonemodel.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -43,6 +43,7 @@
 // CONSTANTS
 const TInt KDriveProfile ( 6 );
 const TInt KPECallTimerOff = 0;
+const TInt KTimesToSplitValue = 16;
 
 // ==================== LOCAL FUNCTIONS ====================
 
@@ -96,6 +97,8 @@
     TEFLOGSTRING( KTAOBJECT, "CPEPhoneModel::ConstructL: 5" );
     iActiveStarter->StartUp();
     TEFLOGSTRING( KTAOBJECT, "CPEPhoneModel::ConstructL: 6" );
+    // Reserve needed callinfo and remoteinfo from heap.
+    iCallInfo = new ( ELeave ) RMobileCall::TMobileCallInfoV3;
     }// ConstructL
 
 // -----------------------------------------------------------------------------
@@ -145,6 +148,7 @@
     delete iCallHandling;
     delete iExternalDataHandler;
     delete iCallStackCutter;
+    delete iCallInfo;
 
     if ( iActiveStarter )
         {
@@ -967,6 +971,7 @@
             "PE cpephonemodel::sendmessage > iEngineMonitor.HandleError: messageName=%s, CallId=%d",
         messageName2.Ptr( ), aCallId );
         #endif
+        SetCallError( aCallId );
         TPEErrorInfo errorInfo;
     	errorInfo.iErrorCode = errorCode;
     	errorInfo.iCallId = aCallId;
@@ -979,6 +984,7 @@
             KTAERROR, 
             "PE cpephonemodel::sendmessage > iEngineMonitor.HandleError: messageName=EPEMessageCallHandlingError, CallId=%d"
         , aCallId );
+        SetCallError( aCallId );
 	    TPEErrorInfo errorInfo = iEngineInfo->ErrorInfo();
     	errorInfo.iCallId = aCallId;
     	errorInfo.iErrorType = EPECcp;
@@ -996,6 +1002,7 @@
         TEFLOGSTRING( 
             KTAERROR, 
             "PE cpephonemodel::sendmessage > iEngineMonitor.HandleError: messageName=EPEMessageServiceHandlingError" );
+        SetCallError( aCallId );
         TPEErrorInfo errorInfo = iEngineInfo->ErrorInfo();
         errorInfo.iCallId = aCallId;
         errorInfo.iErrorType = EPECch;
@@ -1505,4 +1512,25 @@
     return KErrNone;
     }
 
+// -----------------------------------------------------------------------------
+// SetCallError
+// -----------------------------------------------------------------------------
+//
+void CPEPhoneModel::SetCallError( TInt aCallId )
+    {
+    TInt callError = KErrNone;
+    if ( iCallHandling )
+        {
+        TInt err = iCallHandling->GetCallInfo( *iCallInfo, aCallId );
+        
+        if ( err == KErrNone && ( iCallInfo->iExitCode & 0xFFFF0000 ) &&
+                aCallId > KErrNotFound ) 
+            {
+            callError = ( iCallInfo->iExitCode >> KTimesToSplitValue ); 
+            //Set protocol spesific error code to EngineInfo
+            EngineInfo()->SetProtocolError( callError, aCallId );
+            }
+        }
+    }
+	
 // End of File
--- a/phonesettings/aiwcallimageplugin/src/aiwcallimageplugin.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phonesettings/aiwcallimageplugin/src/aiwcallimageplugin.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -109,7 +109,7 @@
     const CAiwGenericParamList& aInParamList,
     CAiwGenericParamList& /*aOutParamList*/,
     TUint aCmdOptions,
-    const MAiwNotifyCallback* /*aCallback*/ )
+    const MAiwNotifyCallback* aCallback )
     {
     
     // Cancel bit must always be checked. Support can be implemented if necessary.
@@ -132,7 +132,23 @@
             
         if ( index >= 0 && genericParam )
             {
-             User::LeaveIfError( SetCallImagePathL( genericParam ) );
+            TInt err = SetCallImagePathL( genericParam );
+            if ( aCallback )
+                {
+                TInt eventId = err ? KAiwEventError : KAiwEventCompleted;
+                // Must cast this because of AIW bug
+                MAiwNotifyCallback* nonConstCallback =
+                        const_cast<MAiwNotifyCallback*> ( aCallback );
+                CAiwGenericParamList* eventParamList = CAiwGenericParamList::NewL();
+                CleanupStack::PushL( eventParamList );
+                nonConstCallback->HandleNotifyL( 
+                        aCmdId,
+                        eventId,
+                        *eventParamList,
+                        aInParamList );
+                CleanupStack::PopAndDestroy( eventParamList );
+                }
+            User::LeaveIfError( err );
             }
         }
     }
--- a/phoneuis/BubbleManager/Inc/BMUtils.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneuis/BubbleManager/Inc/BMUtils.h	Tue Sep 14 21:18:17 2010 +0300
@@ -431,21 +431,6 @@
             CEikImage*& aBubble );
             
         /**
-        * Makes bubble image transparent based on given 
-        * 9-piece mask frame.
-        * @since 3.1
-        * @param aFrameID Skin id for frame.
-        * @param aOuterRect Outer rectangle.
-        * @param aInnerRect Inner rectangle.
-        * @param aBubble Bubble image.
-        */
-        static void AddTransparencyToBubbleImageL(
-            const TAknsItemID& aFrameID,
-            const TRect& aOuterRect,
-            const TRect& aInnerRect,    
-            CEikImage*& aBubble );
-            
-        /**
         * Adds call object image to bubble image.
         * @since 3.1
         * @param aCOImage Image.
--- a/phoneuis/BubbleManager/Src/BMUtils.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneuis/BubbleManager/Src/BMUtils.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -1465,72 +1465,6 @@
     }
 
 // ---------------------------------------------------------------------------
-// BubbleUtils::AddTransparencyToBubbleImageL
-// ---------------------------------------------------------------------------
-//    
-void BubbleUtils::AddTransparencyToBubbleImageL(
-    const TAknsItemID& aFrameID,
-    const TRect& aOuterRect,
-    const TRect& aInnerRect,    
-    CEikImage*& aBubble )
-    {
-    
-    const CFbsBitmap* currentMask = aBubble->Mask();
-    TSize maskSize( currentMask->SizeInPixels() );
-    TRect rect( maskSize );
-    
-    // create transparency frame
-    CFbsBitmap* transparency = new(ELeave) CFbsBitmap;
-    CleanupStack::PushL( transparency );
-    User::LeaveIfError( transparency->Create( aOuterRect.Size(), 
-                                              EGray256 ) );
-    CFbsBitmapDevice* transparencyDev = CFbsBitmapDevice::NewL( transparency );
-    CleanupStack::PushL( transparencyDev );
-    CFbsBitGc* transparencyCtx;
-    User::LeaveIfError( transparencyDev->CreateContext( transparencyCtx ) );
-    CleanupStack::PushL( transparencyCtx );
-    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-    AknsDrawUtils::DrawFrame( skin,
-                              *transparencyCtx,
-                              aOuterRect,
-                              aInnerRect,
-                              aFrameID,
-                              KAknsIIDDefault,
-                              KAknsDrawParamDefault );
-    
-    CleanupStack::PopAndDestroy( 2, transparencyDev );
-            
-    // create solid black mask
-    CFbsBitmap* solidBlack = new(ELeave) CFbsBitmap;
-    CleanupStack::PushL( solidBlack );
-    User::LeaveIfError( solidBlack->Create( maskSize, EGray256 ) );
-    CFbsBitmapDevice* dev = CFbsBitmapDevice::NewL( solidBlack );
-    CleanupStack::PushL( dev );
-    CFbsBitGc* gc;
-    User::LeaveIfError( dev->CreateContext( gc ) ); 
-    CleanupStack::PushL( gc );
-    
-    gc->SetBrushColor( KRgbBlack );
-    gc->SetBrushStyle( CGraphicsContext::ESolidBrush );
-    gc->DrawRect( rect );
-    
-    // blit original mask on the black mask using transparency mask
-    gc->BitBltMasked( TPoint(0,0), 
-                      currentMask,
-                      TRect( currentMask->SizeInPixels() ), 
-                      transparency, 
-                      ETrue );
- 
-    CleanupStack::PopAndDestroy( 2, dev);
-    
-    CleanupStack::Pop(solidBlack);
-    aBubble->SetMask( solidBlack );
-        
-    CleanupStack::PopAndDestroy( transparency );
-    delete currentMask;
-    }
-
-// ---------------------------------------------------------------------------
 // BubbleUtils::PrepareCallObjectToBubbleImageL
 // ---------------------------------------------------------------------------
 //    
--- a/phoneuis/Ussd/src/UssdAppUi.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneuis/Ussd/src/UssdAppUi.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -115,6 +115,7 @@
             {
             // Send string and exit the application
             HBufC* buffer = iAppContainer->Editor().GetTextInHBufL();
+            CleanupStack::PushL( buffer );
             __ASSERT_DEBUG(
                 buffer->Length() <= KUssdEditorMaxLenght ,
                 User::Invariant() );
@@ -125,9 +126,8 @@
                 {
                 iComms->InformExitReason( EPhCltSendCompleted );
                 Exit();                
-                }         
-
-            delete buffer;
+                }  
+            CleanupStack::PopAndDestroy( buffer );
             break;
             }
 
--- a/phoneuis/dialer/inc/cdialernumberentry.h	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneuis/dialer/inc/cdialernumberentry.h	Tue Sep 14 21:18:17 2010 +0300
@@ -336,7 +336,9 @@
         CEikAppUi* iAppUi;
         
         CIdle* iLateFocuser;
-
+        
+        // Allow or disallow usage of late focuser in different conditions. 
+        TBool iLateFocuserCanBeUsed;
     };
 
 #endif      // CDIALERNUMBERENTRY_H
--- a/phoneuis/dialer/src/cdialernumberentry.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneuis/dialer/src/cdialernumberentry.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -173,8 +173,9 @@
     
     TBool vkbOpen = ( iEditor->AknEditorFlags() & EAknEditorFlagTouchInputModeOpened );
     
-    iLateFocuser->Cancel(); 
-    if ( aFocus && !vkbOpen )
+    iLateFocuser->Cancel();
+
+    if ( aFocus && !vkbOpen && iLateFocuserCanBeUsed )
         {
         // The setting of focus needs to be delayed, because otherwise
         // editors cursor is drawn first. Cursor can be seen clearly
@@ -191,6 +192,7 @@
         {       
         DoSetFocus( aFocus, aDrawNow );
         }
+
     DIALER_PRINT("numberentry::SetFocus>");
     }
     
@@ -227,7 +229,11 @@
     if ( aFocus != (iEditor-> IsFocused() ? ETrue : EFalse ) )
         {
         iEditor->SetFocus( aFocus );
-        }   
+        }
+
+    // Don't allow usage of late focuser until next layout change or Dialer launch
+    iLateFocuserCanBeUsed = EFalse;
+
     DIALER_PRINT("numberentry::DoSetFocus>");  
     }
 
@@ -575,6 +581,9 @@
     
     HandleEditorFormatting();
     iEditor->DrawDeferred();
+    
+    // Allow usage of late focuser
+    iLateFocuserCanBeUsed = ETrue;
     }
 
 // ---------------------------------------------------------------------------
--- a/phoneuis/easydialing/src/easydialingutils.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneuis/easydialing/src/easydialingutils.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -23,6 +23,17 @@
 const TText KNameSeparatorChar = ' ';
 const TText KListFieldSeparatorChar = '\t';
 
+const TText KGraphicReplaceCharacter = ' ';
+
+// Zero Widthcharacters
+const TUint KZWSCharacter = 0x200B;
+const TUint KZWNJCharacter = 0x200C;
+const TUint KZWJCharacter = 0x200D;
+
+inline TBool ZWSCharacter( const TChar aChar );
+
+void ReplaceNonGraphicCharacters( TDes& aText, TText aChar );
+ 
 // -----------------------------------------------------------------------------
 // CreateContactStringLC
 //
@@ -37,14 +48,17 @@
     // first strip control chars from the names
     HBufC* firstName = aFirstName.AllocLC();
     TPtr fPtr = firstName->Des();
+    ReplaceNonGraphicCharacters( fPtr, KGraphicReplaceCharacter );
     AknTextUtils::StripCharacters( fPtr, KAknStripListControlChars );
 
     HBufC* lastName = aLastName.AllocLC();
     TPtr lPtr = lastName->Des();
+    ReplaceNonGraphicCharacters( lPtr, KGraphicReplaceCharacter );
     AknTextUtils::StripCharacters( lPtr, KAknStripListControlChars );
 
     HBufC* companyName = aCompanyName.AllocLC();
     TPtr cPtr = companyName->Des();
+    ReplaceNonGraphicCharacters( cPtr, KGraphicReplaceCharacter );
     AknTextUtils::StripCharacters( cPtr, KAknStripListControlChars );
 
     // Calculate string lenght. If first name and last name are missing, company name is duplicated.
@@ -99,3 +113,49 @@
     CleanupStack::PushL( string );
     return string;
     }
+
+/*
+ * ==============================================================================
+ * 
+ * Local functions
+ * 
+ * ==============================================================================
+ */
+
+/**
+ * Checkif the given char is a zero width character:
+ * ZeroWidth Space, Zero Width Non-Joiner
+ * orZero Width Joiner character
+ * @paramaChar Given character
+ *@return ETrue if aChar is zero width character.
+ *        EFalse if aChar is not specified zero width character.
+ */
+
+inline TBool ZWSCharacter( const TChar aChar )
+   {
+   const TChar zwsChar( KZWSCharacter );
+   const TChar zwnjChar( KZWNJCharacter );
+   const TChar zwjChar( KZWJCharacter );
+   return ( aChar == zwsChar ) || ( aChar == zwnjChar ) ||
+          ( aChar == zwjChar );
+}
+
+/**
+ * Replaces all non-graphic characters (!TChar::IsGraph()) in
+ * a string with the specified character.
+ **/
+
+void ReplaceNonGraphicCharacters( TDes& aText, TText aChar )
+   {
+   const TInt len = aText.Length();
+   for ( TInt i = 0; i <len; ++i )
+      {
+      if ( !TChar( aText[i] ).IsGraph() && !ZWSCharacter( aText[i] ) )
+          {
+          //If non-graphic char is specified in ZWSCharacter,
+          //it will not be replaced. Otherwise replace non-graphic
+          //character with aChar.
+          aText[i] = aChar;
+          }
+      }
+    }