Revision: 201009 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Mon, 15 Mar 2010 12:40:24 +0200
branchRCL_3
changeset 15 2a26698d78ba
parent 14 24062c24fe38
child 17 38529f706030
Revision: 201009 Kit: 201010
phoneapp/phoneui/loc/voip.loc
phoneapp/phoneui/src/cphoneappui.cpp
phoneapp/phoneui/srcdata/phoneui.rss
phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def
phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def
phoneapp/phoneuicontrol/inc/cphonestate.h
phoneapp/phoneuicontrol/inc/cphonestateincoming.h
phoneapp/phoneuicontrol/inc/cphonestatemachine.h
phoneapp/phoneuicontrol/inc/cphonestatestartup.h
phoneapp/phoneuicontrol/inc/cphonesystemeventhandler.h
phoneapp/phoneuicontrol/inc/cphoneuicontroller.h
phoneapp/phoneuicontrol/inc/mphonestate.h
phoneapp/phoneuicontrol/inc/mphonestatemachine.h
phoneapp/phoneuicontrol/inc/mphonesystemeventhandler.h
phoneapp/phoneuicontrol/inc/mphonesystemevents.h
phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp
phoneapp/phoneuicontrol/src/cphonestate.cpp
phoneapp/phoneuicontrol/src/cphonestateidle.cpp
phoneapp/phoneuicontrol/src/cphonestateincoming.cpp
phoneapp/phoneuicontrol/src/cphonestatemachine.cpp
phoneapp/phoneuicontrol/src/cphonestatestartup.cpp
phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp
phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp
phoneapp/phoneuistates/bwins/phoneuistatesu.def
phoneapp/phoneuistates/eabi/phoneuistatesu.def
phoneapp/phoneuistates/inc/cphoneconferenceandsingleandwaiting.h
phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h
phoneapp/phoneuistates/inc/cphonesingleandwaiting.h
phoneapp/phoneuistates/inc/cphonestartupsimlockui.h
phoneapp/phoneuistates/inc/cphonetwosinglesandwaiting.h
phoneapp/phoneuistates/src/cphoneconference.cpp
phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp
phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp
phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp
phoneapp/phoneuistates/src/cphoneincoming.cpp
phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp
phoneapp/phoneuistates/src/cphonesinglecall.cpp
phoneapp/phoneuistates/src/cphonetwosingles.cpp
phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp
phoneapp/phoneuiutils/bwins/phoneuiutilsu.def
phoneapp/phoneuiutils/eabi/phoneuiutilsu.def
phoneapp/phoneuiutils/group/phoneuiutils.mmp
phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h
phoneapp/phoneuiutils/inc/phonerssbase.h
phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp
phoneapp/phoneuiutils/src/cphonetimer.cpp
phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp
phoneapp/phoneuiutils/src/phoneloggerviewcommands.st
phoneapp/phoneuiview/eabi/phoneuiviewu.def
phoneapp/phoneuiview/group/phoneuiview.mmp
phoneapp/phoneuiview/inc/cphonenote.h
phoneapp/phoneuiview/inc/cphonenotecontroller.h
phoneapp/phoneuiview/inc/cphoneringingtoneplayerao.h
phoneapp/phoneuiview/inc/cphoneviewcontroller.h
phoneapp/phoneuiview/inc/mphoneringingtonesrv.h
phoneapp/phoneuiview/inc/phoneringingtoneclient.h
phoneapp/phoneuiview/inc/phoneringingtonesrv.h
phoneapp/phoneuiview/inc/phoneringingtonesrv.hrh
phoneapp/phoneuiview/inc/phoneringingtonesrvplayerao.h
phoneapp/phoneuiview/inc/phoneringingtonesrvsession.h
phoneapp/phoneuiview/inc/phoneuiviewtrace.h
phoneapp/phoneuiview/inc/phoneviewcommanddefinitions.h
phoneapp/phoneuiview/src/cphoneaudioplayer.cpp
phoneapp/phoneuiview/src/cphonenote.cpp
phoneapp/phoneuiview/src/cphonenotecontroller.cpp
phoneapp/phoneuiview/src/cphoneringingtoneplayerao.cpp
phoneapp/phoneuiview/src/cphoneviewcontroller.cpp
phoneapp/phoneuiview/src/phoneringingtoneclient.cpp
phoneapp/phoneuiview/src/phoneringingtonesrv.cpp
phoneapp/phoneuiview/src/phoneringingtonesrvplayerao.cpp
phoneapp/phoneuiview/src/phoneringingtonesrvsession.cpp
phoneapp/phoneuivoipextension/src/cphoneresourceresolvervoip.cpp
phoneapp/phoneuivoipextension/srcdata/phoneuivoip.rss
phoneapp/silenceactionplugin/data/silence.rul
phoneengine/callhandling/src/cpecallhandling.cpp
phoneengine/phonemodel/conf/s60telephony.confml
phoneengine/phonemodel/conf/s60telephony_102828F8.crml
phoneengine/phonemodel/inc/telephonyvariant.hrh
phoneuis/BubbleManager/Src/BMBubbleManager.cpp
phoneuis/Ussd/group/ussd.mmp
phoneuis/Ussd/inc/UssdLogger.h
phoneuis/Ussd/inc/UssdNaviPane.h
phoneuis/Ussd/src/UssdAppUi.cpp
phoneuis/Ussd/src/UssdContainer.cpp
phoneuis/Ussd/src/UssdEditorLines.cpp
phoneuis/Ussd/src/UssdNaviPane.cpp
phoneuis/dialer/src/cdialerkeypadcontainer.cpp
phoneuis/dialer/src/cdialertoolbarcontainer.cpp
phoneuis/easydialing/inc/dialingextensioninterface.h
phoneuis/easydialing/inc/easydialingcenreplistener.h
phoneuis/easydialing/inc/easydialingcontactdatamanager.h
phoneuis/easydialing/inc/easydialinglistboxdata.h
phoneuis/easydialing/inc/easydialingplugin.h
phoneuis/easydialing/src/easydialingcenreplistener.cpp
phoneuis/easydialing/src/easydialingcontactdatamanager.cpp
phoneuis/easydialing/src/easydialinglistbox.cpp
phoneuis/easydialing/src/easydialinglistboxdata.cpp
phoneuis/easydialing/src/easydialinglistboxitemdrawer.cpp
phoneuis/easydialing/src/easydialingplugin.cpp
--- a/phoneapp/phoneui/loc/voip.loc	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneui/loc/voip.loc	Mon Mar 15 12:40:24 2010 +0200
@@ -580,4 +580,21 @@
 // r: 5.0
 #define qtn_ipcomm_creating_conn_failed_permanently "Connecting %U failed due to defective settings. Contact your service provider."
 
+// d: Prompt text for number entry.
+// d: Topmost row shows text in case of transfer dialer. 
+// l: heading_pane_t1  
+// w:
+// r: 5.0
+//
+#define qtn_dialer_unatt_transfer_input_field_text "Address:"
+
+// d: Text in the transfer Dialer Options menu. This is shown only
+// d: when user has entered characters to number entry. This item
+// d: performs the unattended transfer request.
+// l: list_single_pane_t1_cp2  
+// w:
+// r: 5.0
+//
+#define qtn_dialer_options_send_uatransfer_req "Send"
+
 // End of File
--- a/phoneapp/phoneui/src/cphoneappui.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneui/src/cphoneappui.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -602,16 +602,20 @@
                     return;     
                     }
                            
-                if ( iQwertyHandler->IsQwertyInput() )
+                // Check if key press is simulated by FEP or by touch dialer
+                TBool fepSimulated = keyEvent->iModifiers & EModifierSpecial;               
+                TInt modifierMask = ( EModifierNumLock | EModifierKeypad );
+                TBool dialerSimulated = ( ( keyEvent->iModifiers & modifierMask ) == modifierMask );
+                        
+                if ( !fepSimulated && !dialerSimulated && iQwertyHandler->IsQwertyInput() )
                     {
-                    TInt code = iQwertyHandler->NumericKeyCode( *keyEvent );
-                    TBool fepSimulated = keyEvent->iModifiers & EModifierSpecial; 
-                    if ( !fepSimulated && 
-                         ( ( code != EKeyNull && code != keyEvent->iCode ) ||
-                         ( code == EKeyNull && CPhoneKeys::IsNumericKey( 
-                                                             *keyEvent, 
-                                                             ( TEventCode ) aEvent.Type() ) ) )
-                         ) 
+                    TInt code = iQwertyHandler->NumericKeyCode( *keyEvent );                    
+                    if ( code == EKeyNull && CPhoneKeys::IsNumericKey( *keyEvent, ( TEventCode ) aEvent.Type() ) )
+                        {
+                        code = keyEvent->iCode;
+                        }
+                    
+                    if ( code != EKeyNull ) 
                         {
                         // Modify event according to keyboard layout
                         TWsEvent newWsEvent = aEvent;    
@@ -824,15 +828,6 @@
     {
     __LOGMETHODSTARTEND( EPhonePhoneapp, "CPhoneAppUI::HandleApplicationSpecificEventL" );
     
-    if( aType == EEikKeyLockEnabled )
-        {
-        iPhoneUIController->HandleKeyLockEnabled( ETrue );
-        }
-    else if( aType == EEikKeyLockDisabled )
-        {
-        iPhoneUIController->HandleKeyLockEnabled( EFalse );
-        }
-    
     CAknAppUi::HandleApplicationSpecificEventL( aType, aEvent );
     }
 
--- a/phoneapp/phoneui/srcdata/phoneui.rss	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneui/srcdata/phoneui.rss	Mon Mar 15 12:40:24 2010 +0200
@@ -35,7 +35,6 @@
 #include    <uikon.hrh>
 #include    <AiwCommon.hrh>
 #include    <AiwCommon.rh>
-#include    <aknnotifyplugin.loc>
 
 #include    <phone.loc>
 
@@ -4797,14 +4796,6 @@
 
 // ---------------------------------------------------------
 //
-RESOURCE TBUF r_notetext_use_keyguard_to_unlock
-    {
-    buf = qtn_keyg_info_note_display_lock_switch;
-    }
-
-
-// ---------------------------------------------------------
-//
 RESOURCE TBUF r_incal_remote_create_conference_text
     {
     buf = qtn_incal_info_conf_active;
--- a/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def	Mon Mar 15 12:40:24 2010 +0200
@@ -1,238 +1,227 @@
 EXPORTS
 	?CallWaitingNoteL@CPhoneState@@IAEXH@Z @ 1 NONAME ; void CPhoneState::CallWaitingNoteL(int)
 	?HandleKeyMessageL@CPhoneStateIncoming@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 2 NONAME ; void CPhoneStateIncoming::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?EnableCallUIL@CPhoneState@@QAEXXZ @ 3 NONAME ; void CPhoneState::EnableCallUIL(void)
-	?TopAppIsDisplayedL@CPhoneState@@IBEHXZ @ 4 NONAME ; int CPhoneState::TopAppIsDisplayedL(void) const
-	?HandleKeyMessageL@CPhoneStateCallSetup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 5 NONAME ; void CPhoneStateCallSetup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?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)
-	?ShowQueryL@CPhoneState@@IAEXH@Z @ 14 NONAME ; void CPhoneState::ShowQueryL(int)
-	?PhoneNumberAvailableInPhoneEngineL@CPhoneStateInCall@@IAEXH@Z @ 15 NONAME ; void CPhoneStateInCall::PhoneNumberAvailableInPhoneEngineL(int)
-	?DisplayCallTerminationNoteL@CPhoneState@@IAEXXZ @ 16 NONAME ; void CPhoneState::DisplayCallTerminationNoteL(void)
-	??0CPhoneStateInCall@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 17 NONAME ; CPhoneStateInCall::CPhoneStateInCall(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?HandleNumberLongKeyPressL@CPhoneStateIdle@@IAEXXZ @ 18 NONAME ; void CPhoneStateIdle::HandleNumberLongKeyPressL(void)
-	?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)
-	?RetainPreviousKeylockStateL@CPhoneState@@QAEXXZ @ 30 NONAME ; void CPhoneState::RetainPreviousKeylockStateL(void)
-	?HandlePhoneEngineMessageL@CPhoneStateIdle@@UAEXHH@Z @ 31 NONAME ; void CPhoneStateIdle::HandlePhoneEngineMessageL(int, int)
-	?HandleDialingL@CPhoneStateIdle@@MAEXH@Z @ 32 NONAME ; void CPhoneStateIdle::HandleDialingL(int)
-	?CustomizedDialerCbaResourceIdL@CPhoneState@@IAEHXZ @ 33 NONAME ; int CPhoneState::CustomizedDialerCbaResourceIdL(void)
-	?CaptureKeysDuringCallNotificationL@CPhoneState@@IAEXH@Z @ 34 NONAME ; void CPhoneState::CaptureKeysDuringCallNotificationL(int)
-	?HandleKeyPressDurationL@CPhoneState@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 35 NONAME ; void CPhoneState::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
-	?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 36 NONAME ; void CPhoneStateMachine::ChangeState(int)
-	?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 37 NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void)
-	?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 38 NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int)
-	?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 39 NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void)
-	?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 40 NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 41 NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
-	?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 42 NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void)
-	?HandleCenRepChangeL@CPhoneState@@UAEXABVTUid@@I@Z @ 43 NONAME ; void CPhoneState::HandleCenRepChangeL(class TUid const &, unsigned int)
-	?HandleLongHashL@CPhoneState@@UAEXXZ @ 44 NONAME ; void CPhoneState::HandleLongHashL(void)
-	?DialL@CPhoneStateIdle@@MAEXABVTDesC16@@W4TPhoneNumberType@@W4TDialInitiationMethod@1@@Z @ 45 NONAME ; void CPhoneStateIdle::DialL(class TDesC16 const &, enum TPhoneNumberType, enum CPhoneStateIdle::TDialInitiationMethod)
-	?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 46 NONAME ; void CPhoneState::ShowNumberBusyNoteL(void)
-	?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 47 NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(void)
-	?HandleIdleForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 48 NONAME ; void CPhoneStateIdle::HandleIdleForegroundEventL(void)
-	?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 49 NONAME ; void CPhoneState::HandleDisconnectingL(int)
-	?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 50 NONAME ; void CPhoneState::HandleAudioMuteChangedL(void)
-	?HandleKeyLockEnabled@CPhoneState@@UAEXH@Z @ 51 NONAME ; void CPhoneState::HandleKeyLockEnabled(int)
-	?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 52 NONAME ; int CPhoneStateIncoming::HandleCommandL(int)
-	?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 53 NONAME ; void CPhoneState::UpdateSingleActiveCallL(int)
-	?IsOnScreenDialerSupported@CPhoneState@@IBEHXZ @ 54 NONAME ; int CPhoneState::IsOnScreenDialerSupported(void) const
-	?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 55 NONAME ; enum TPESimState CPhoneState::SimState(void) const
-	?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 56 NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?SetupIdleScreenInBackgroundL@CPhoneState@@IAEXXZ @ 57 NONAME ; void CPhoneState::SetupIdleScreenInBackgroundL(void)
-	?SendGlobalWarningNoteL@CPhoneState@@IAEXH@Z @ 58 NONAME ; void CPhoneState::SendGlobalWarningNoteL(int)
-	?CompleteSatRequestL@CPhoneState@@IAEXH@Z @ 59 NONAME ; void CPhoneState::CompleteSatRequestL(int)
-	?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 60 NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?LaunchNewCallQueryL@CPhoneStateInCall@@IAEXXZ @ 61 NONAME ; void CPhoneStateInCall::LaunchNewCallQueryL(void)
-	?SetCallHeaderTextsForCallComingInL@CPhoneState@@IAEXHHPAVTPhoneCmdParamCallHeaderData@@@Z @ 62 NONAME ; void CPhoneState::SetCallHeaderTextsForCallComingInL(int, int, class TPhoneCmdParamCallHeaderData *)
-	?IsSimOk@CPhoneState@@QAEHXZ @ 63 NONAME ; int CPhoneState::IsSimOk(void)
-	?ClearNumberEntryContentCache@CPhoneState@@IAEXXZ @ 64 NONAME ; void CPhoneState::ClearNumberEntryContentCache(void)
-	?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 65 NONAME ; int CPhoneStateIdle::HandleCommandL(int)
-	?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 66 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void)
-	?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 67 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void)
-	?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 68 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void)
-	?IsKeyLockOn@CPhoneState@@MBEHXZ @ 69 NONAME ; int CPhoneState::IsKeyLockOn(void) const
-	??1CPhoneStateInCall@@UAE@XZ @ 70 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void)
-	?CustomizedDialerMenuResourceIdL@CPhoneState@@IAEHXZ @ 71 NONAME ; int CPhoneState::CustomizedDialerMenuResourceIdL(void)
-	?ShowReconnectQueryL@CPhoneReconnectQuery@@QAEXH@Z @ 72 NONAME ; void CPhoneReconnectQuery::ShowReconnectQueryL(int)
-	?UpdateSilenceButtonDimming@CPhoneState@@IAEXXZ @ 73 NONAME ; void CPhoneState::UpdateSilenceButtonDimming(void)
-	?SetNumberEntryVisibilityL@CPhoneState@@IAEXH@Z @ 74 NONAME ; void CPhoneState::SetNumberEntryVisibilityL(int)
-	?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 75 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &)
-	?ConstructL@CPhoneStateInCall@@MAEXXZ @ 76 NONAME ; void CPhoneStateInCall::ConstructL(void)
-	?OnlyHashInNumberEntryL@CPhoneStateIdle@@MAEXXZ @ 77 NONAME ; void CPhoneStateIdle::OnlyHashInNumberEntryL(void)
-	?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 78 NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void)
-	?HandlePhoneForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 79 NONAME ; void CPhoneStateIdle::HandlePhoneForegroundEventL(void)
-	?HandleHoldSwitchL@CPhoneState@@QAEXXZ @ 80 NONAME ; void CPhoneState::HandleHoldSwitchL(void)
-	?CloseDtmfQueryL@CPhoneStateInCall@@IAEXXZ @ 81 NONAME ; void CPhoneStateInCall::CloseDtmfQueryL(void)
-	?DynInitMenuBarL@CPhoneState@@UAEXHPAVCEikMenuBar@@@Z @ 82 NONAME ; void CPhoneState::DynInitMenuBarL(int, class CEikMenuBar *)
-	?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 83 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
-	?HandleNumberEntryEdited@CPhoneState@@MAEXXZ @ 84 NONAME ; void CPhoneState::HandleNumberEntryEdited(void)
-	?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 85 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int)
-	?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 86 NONAME ; void CPhoneState::DialMultimediaCallL(void)
-	?NewL@CPhoneUIController@@SAPAV1@PAVMPhoneViewCommandHandle@@@Z @ 87 NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class MPhoneViewCommandHandle *)
-	?HandleCreateNumberEntryL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 88 NONAME ; void CPhoneStateStartup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
-	?CheckDisableHWKeysAndCallUIL@CPhoneState@@QAEXXZ @ 89 NONAME ; void CPhoneState::CheckDisableHWKeysAndCallUIL(void)
-	?IsMenuBarVisibleL@CPhoneState@@UBEHXZ @ 90 NONAME ; int CPhoneState::IsMenuBarVisibleL(void) const
-	?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 91 NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &)
-	?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 92 NONAME ; int CPhoneStateCallSetup::HandleCommandL(int)
-	?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 93 NONAME ; void CPhoneState::HandleAudioOutputChangedL(void)
-	??1CPhoneUIController@@UAE@XZ @ 94 NONAME ; CPhoneUIController::~CPhoneUIController(void)
-	?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 95 NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?UpdateIncomingContextMenuL@CPhoneState@@MAEXH@Z @ 96 NONAME ; void CPhoneState::UpdateIncomingContextMenuL(int)
-	?OpenMenuBarL@CPhoneStateInCall@@MAEXXZ @ 97 NONAME ; void CPhoneStateInCall::OpenMenuBarL(void)
-	?UpdateIncomingCbaL@CPhoneCbaManager@@QAEXH@Z @ 98 NONAME ; void CPhoneCbaManager::UpdateIncomingCbaL(int)
-	?SetTouchPaneButtonDisabled@CPhoneState@@IAEXH@Z @ 99 NONAME ; void CPhoneState::SetTouchPaneButtonDisabled(int)
-	?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 100 NONAME ; void CPhoneStateIncoming::ConstructL(void)
-	?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 101 NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &)
-	?SetTouchPaneButtons@CPhoneState@@IAEXH@Z @ 102 NONAME ; void CPhoneState::SetTouchPaneButtons(int)
-	?HandleIdleForegroundEventL@CPhoneStateStartup@@UAEXXZ @ 103 NONAME ; void CPhoneStateStartup::HandleIdleForegroundEventL(void)
-	?CallFromNumberEntryL@CPhoneState@@IAEXXZ @ 104 NONAME ; void CPhoneState::CallFromNumberEntryL(void)
-	?UpdateCbaL@CPhoneCbaManager@@QAEXH@Z @ 105 NONAME ; void CPhoneCbaManager::UpdateCbaL(int)
-	?IsVideoCall@CPhoneState@@IAEHH@Z @ 106 NONAME ; int CPhoneState::IsVideoCall(int)
-	?IsSwivelClosed@CPhoneState@@QBEHXZ @ 107 NONAME ; int CPhoneState::IsSwivelClosed(void) const
-	?CloseCustomizedDialerL@CPhoneState@@QAEXXZ @ 108 NONAME ; void CPhoneState::CloseCustomizedDialerL(void)
-	?HandlePhoneForegroundEventL@CPhoneUIController@@UAEXXZ @ 109 NONAME ; void CPhoneUIController::HandlePhoneForegroundEventL(void)
-	?CheckIfRestoreNEContentAfterDtmfDialer@CPhoneState@@IAEXXZ @ 110 NONAME ; void CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer(void)
-	?UpdateInCallContextMenuL@CPhoneState@@UAEXXZ @ 111 NONAME ; void CPhoneState::UpdateInCallContextMenuL(void)
-	?HandleNumericKeyEventL@CPhoneState@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 112 NONAME ; void CPhoneState::HandleNumericKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?SetToolbarDimming@CPhoneState@@IAEXH@Z @ 113 NONAME ; void CPhoneState::SetToolbarDimming(int)
-	?SendGlobalErrorNoteL@CPhoneState@@QAEXH@Z @ 114 NONAME ; void CPhoneState::SendGlobalErrorNoteL(int)
-	?IsAutoLockOn@CPhoneState@@UBEHXZ @ 115 NONAME ; int CPhoneState::IsAutoLockOn(void) const
-	?UpdateCbaL@CPhoneStateCallSetup@@MAEXH@Z @ 116 NONAME ; void CPhoneStateCallSetup::UpdateCbaL(int)
-	?RestoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 117 NONAME ; void CPhoneState::RestoreNumberEntryContentL(void)
-	?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 118 NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?IsNumberEntryContentStored@CPhoneState@@IAEHXZ @ 119 NONAME ; int CPhoneState::IsNumberEntryContentStored(void)
-	?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 120 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void)
-	?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 121 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void)
-	?DialVoiceCallL@CPhoneState@@IAEXXZ @ 122 NONAME ; void CPhoneState::DialVoiceCallL(void)
-	?EndUiUpdate@CPhoneState@@IAEXXZ @ 123 NONAME ; void CPhoneState::EndUiUpdate(void)
-	?HandleKeyPressDurationL@CPhoneStateIncoming@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 124 NONAME ; void CPhoneStateIncoming::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
-	?UpdateInCallCbaL@CPhoneStateInCall@@MAEXXZ @ 125 NONAME ; void CPhoneStateInCall::UpdateInCallCbaL(void)
-	?EndTransEffect@CPhoneState@@QAEXXZ @ 126 NONAME ; void CPhoneState::EndTransEffect(void)
-	?HandleEnvironmentChangeL@CPhoneState@@UAEXH@Z @ 127 NONAME ; void CPhoneState::HandleEnvironmentChangeL(int)
-	?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 128 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 129 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int)
-	?ProcessCommandL@CPhoneState@@UAEHH@Z @ 130 NONAME ; int CPhoneState::ProcessCommandL(int)
-	?BeginUiUpdateLC@CPhoneState@@IAEXXZ @ 131 NONAME ; void CPhoneState::BeginUiUpdateLC(void)
-	?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 132 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void)
-	?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 133 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void)
-	?CreateNumberEntryL@CPhoneStateInCall@@IAEXXZ @ 134 NONAME ; void CPhoneStateInCall::CreateNumberEntryL(void)
-	?HandleSystemEventL@CPhoneUIController@@UAEXABVTWsEvent@@@Z @ 135 NONAME ; void CPhoneUIController::HandleSystemEventL(class TWsEvent const &)
-	?DynInitMenuPaneL@CPhoneUIController@@UAEXHPAVCEikMenuPane@@@Z @ 136 NONAME ; void CPhoneUIController::DynInitMenuPaneL(int, class CEikMenuPane *)
-	??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 137 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?GetRemoteInfoDataL@CPhoneState@@IAEXHAAVTDes16@@@Z @ 138 NONAME ; void CPhoneState::GetRemoteInfoDataL(int, class TDes16 &)
-	?SetDivertIndication@CPhoneState@@UAEXH@Z @ 139 NONAME ; void CPhoneState::SetDivertIndication(int)
-	?UpdateCbaL@CPhoneStateInCall@@MAEXH@Z @ 140 NONAME ; void CPhoneStateInCall::UpdateCbaL(int)
-	?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 141 NONAME ; void CPhoneStateMachine::SetCallId(int)
-	?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 142 NONAME ; int CPhoneUIController::ProcessCommandL(int)
-	?DisplayHeaderForCallComingInL@CPhoneState@@IAEXHH@Z @ 143 NONAME ; void CPhoneState::DisplayHeaderForCallComingInL(int, int)
-	??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 144 NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 145 NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int)
-	??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 146 NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 147 NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 148 NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
-	?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 149 NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?HandleForegroundEventL@CPhoneUIController@@UAEXH@Z @ 150 NONAME ; void CPhoneUIController::HandleForegroundEventL(int)
-	?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 151 NONAME ; void CPhoneStateIdle::HandleSendCommandL(void)
-	?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 152 NONAME ; int CPhoneUIController::HandleCommandL(int)
-	?HandleCreateNumberEntryL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 153 NONAME ; void CPhoneState::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
-	?DisableHWKeysL@CPhoneState@@QAEXXZ @ 154 NONAME ; void CPhoneState::DisableHWKeysL(void)
-	?DisplayHeaderForOutgoingCallL@CPhoneState@@IAEXH@Z @ 155 NONAME ; void CPhoneState::DisplayHeaderForOutgoingCallL(int)
-	?GetBlockedKeyList@CPhoneState@@UBEABV?$RArray@H@@XZ @ 156 NONAME ; class RArray<int> const & CPhoneState::GetBlockedKeyList(void) const
-	?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 157 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int)
-	?IsSpeedDialNumber@CPhoneStateIdle@@IBEHABVTDesC16@@@Z @ 158 NONAME ; int CPhoneStateIdle::IsSpeedDialNumber(class TDesC16 const &) const
-	?IsNumberEntryUsedL@CPhoneState@@UAEHXZ @ 159 NONAME ; int CPhoneState::IsNumberEntryUsedL(void)
-	?PhoneStorage@CPhoneStateMachine@@UAEPAVMPhoneStorage@@XZ @ 160 NONAME ; class MPhoneStorage * CPhoneStateMachine::PhoneStorage(void)
-	??1CPhoneState@@UAE@XZ @ 161 NONAME ; CPhoneState::~CPhoneState(void)
-	?HandleCreateNumberEntryL@CPhoneStateCallSetup@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 162 NONAME ; void CPhoneStateCallSetup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
-	?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 163 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int)
-	?HandlePhoneFocusLostEventL@CPhoneState@@UAEXXZ @ 164 NONAME ; void CPhoneState::HandlePhoneFocusLostEventL(void)
-	??1CPhoneStateMachine@@UAE@XZ @ 165 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void)
-	?HandleIdleForegroundEventL@CPhoneState@@UAEXXZ @ 166 NONAME ; void CPhoneState::HandleIdleForegroundEventL(void)
-	?DynInitMenuPaneL@CPhoneState@@UAEXHPAVCEikMenuPane@@@Z @ 167 NONAME ; void CPhoneState::DynInitMenuPaneL(int, class CEikMenuPane *)
-	?IsDTMFEditorVisibleL@CPhoneState@@IBEHXZ @ 168 NONAME ; int CPhoneState::IsDTMFEditorVisibleL(void) const
-	?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 169 NONAME ; void CPhoneStateCallSetup::ConstructL(void)
-	?BeginTransEffectLC@CPhoneState@@QAEXW4TStateTransEffectType@@@Z @ 170 NONAME ; void CPhoneState::BeginTransEffectLC(enum TStateTransEffectType)
-	?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 171 NONAME ; void CPhoneUIController::HandleMessage(int, int)
-	?HandleSystemEventL@CPhoneState@@UAEXABVTWsEvent@@@Z @ 172 NONAME ; void CPhoneState::HandleSystemEventL(class TWsEvent const &)
-	?NeedToReturnToForegroundAppL@CPhoneState@@IBEHXZ @ 173 NONAME ; int CPhoneState::NeedToReturnToForegroundAppL(void) const
-	?DisplayCallSetupL@CPhoneStateIdle@@IAEXH@Z @ 174 NONAME ; void CPhoneStateIdle::DisplayCallSetupL(int)
-	?ConstructL@CPhoneStateStartup@@MAEXXZ @ 175 NONAME ; void CPhoneStateStartup::ConstructL(void)
-	?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 176 NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?ShowNoteL@CPhoneState@@IAEXH@Z @ 177 NONAME ; void CPhoneState::ShowNoteL(int)
-	?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 178 NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int)
-	?IsAnyQueryActiveL@CPhoneState@@QAEHXZ @ 179 NONAME ; int CPhoneState::IsAnyQueryActiveL(void)
-	?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 180 NONAME ; class MPhoneState * CPhoneStateMachine::State(void)
-	?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 181 NONAME ; void CPhoneState::SetHandsfreeModeL(int)
-	?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 182 NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const
-	?UpdateInCallCbaL@CPhoneStateCallSetup@@MAEXXZ @ 183 NONAME ; void CPhoneStateCallSetup::UpdateInCallCbaL(void)
-	?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 184 NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void)
-	??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 185 NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	??1CPhoneStateIncoming@@UAE@XZ @ 186 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void)
-	?HandleKeyLockEnabled@CPhoneUIController@@UAEXH@Z @ 187 NONAME ; void CPhoneUIController::HandleKeyLockEnabled(int)
-	?DisableCallUIL@CPhoneState@@QAEXXZ @ 188 NONAME ; void CPhoneState::DisableCallUIL(void)
-	?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 189 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void)
-	?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 190 NONAME ; int CPhoneStateIdle::ProcessCommandL(int)
-	?IsNoteVisibleL@CPhoneState@@MAEHXZ @ 191 NONAME ; int CPhoneState::IsNoteVisibleL(void)
-	?DynInitMenuBarL@CPhoneUIController@@UAEXHPAVCEikMenuBar@@@Z @ 192 NONAME ; void CPhoneUIController::DynInitMenuBarL(int, class CEikMenuBar *)
-	?IsAlphanumericSupportedAndCharInput@CPhoneState@@MAEHABUTKeyEvent@@@Z @ 193 NONAME ; int CPhoneState::IsAlphanumericSupportedAndCharInput(struct TKeyEvent const &)
-	?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 194 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int)
-	?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 195 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 196 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
-	?HandleNumberEntryClearedL@CPhoneState@@MAEXXZ @ 197 NONAME ; void CPhoneState::HandleNumberEntryClearedL(void)
-	?OnlyHashInNumberEntryL@CPhoneState@@MAEXXZ @ 198 NONAME ; void CPhoneState::OnlyHashInNumberEntryL(void)
-	?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 199 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void)
-	?ConstructL@CPhoneStateIdle@@MAEXXZ @ 200 NONAME ; void CPhoneStateIdle::ConstructL(void)
-	?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 201 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void)
-	?SetCallHeaderType@CPhoneState@@IAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 202 NONAME ; void CPhoneState::SetCallHeaderType(enum CBubbleManager::TPhoneCallTypeFlags)
-	?SendGlobalInfoNoteL@CPhoneState@@QAEXH@Z @ 203 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int)
-	?DisplayIdleScreenL@CPhoneState@@IAEXXZ @ 204 NONAME ; void CPhoneState::DisplayIdleScreenL(void)
-	?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 205 NONAME ; void CPhoneState::StartShowSecurityNoteL(void)
-	?StoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 206 NONAME ; void CPhoneState::StoreNumberEntryContentL(void)
-	?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 207 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int)
-	?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 208 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int)
-	?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 209 NONAME ; void CPhoneState::SetDefaultFlagsL(void)
-	?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 210 NONAME ; int CPhoneStateInCall::HandleCommandL(int)
-	?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 211 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void)
-	?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 212 NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int)
-	?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 213 NONAME ; int CPhoneStateInCall::GetRingingCallL(void)
-	?HandleIdleForegroundEventL@CPhoneUIController@@UAEXXZ @ 214 NONAME ; void CPhoneUIController::HandleIdleForegroundEventL(void)
-	?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 215 NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void)
-	?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 216 NONAME ; void CPhoneState::HandleForegroundEventL(int)
-	?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 217 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
-	?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 218 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
-	??1CPhoneStateIdle@@UAE@XZ @ 219 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
-	?IsDialingExtensionInFocusL@CPhoneState@@QBEHXZ @ 220 NONAME ; int CPhoneState::IsDialingExtensionInFocusL(void) const
-	?PhoneNumberFromEntryLC@CPhoneState@@IAEPAVHBufC16@@XZ @ 221 NONAME ; class HBufC16 * CPhoneState::PhoneNumberFromEntryLC(void)
-	?BaseConstructL@CPhoneState@@QAEXXZ @ 222 NONAME ; void CPhoneState::BaseConstructL(void)
-	?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 223 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
-	?SpeedDialL@CPhoneStateIdle@@IAEXABIW4TDialInitiationMethod@1@@Z @ 224 NONAME ; void CPhoneStateIdle::SpeedDialL(unsigned int const &, enum CPhoneStateIdle::TDialInitiationMethod)
-	?SetTouchPaneButtonEnabled@CPhoneState@@IAEXH@Z @ 225 NONAME ; void CPhoneState::SetTouchPaneButtonEnabled(int)
-	?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 226 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
-	?SpeedDialCanceledL@CPhoneStateIdle@@IAEXABI@Z @ 227 NONAME ; void CPhoneStateIdle::SpeedDialCanceledL(unsigned int const &)
-	?CloseDTMFEditorL@CPhoneState@@IAEXXZ @ 228 NONAME ; void CPhoneState::CloseDTMFEditorL(void)
-	?SetTouchPaneVisible@CPhoneState@@IAEXH@Z @ 229 NONAME ; void CPhoneState::SetTouchPaneVisible(int)
-	?HandlePhoneFocusLostEventL@CPhoneUIController@@UAEXXZ @ 230 NONAME ; void CPhoneUIController::HandlePhoneFocusLostEventL(void)
-	?HandleKeyLockEnabled@CPhoneStateIncoming@@UAEXH@Z @ 231 NONAME ; void CPhoneStateIncoming::HandleKeyLockEnabled(int)
-	??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 232 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
-	??1CPhoneStateStartup@@UAE@XZ @ 233 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
-	?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 234 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?HandlePEConstructionReadyL@CPhoneStateStartup@@QAEXH@Z @ 235 NONAME ; void CPhoneStateStartup::HandlePEConstructionReadyL(int)
-	?HandlePropertyChangedL@CPhoneStateInCall@@EAEXABVTUid@@IH@Z @ 236 NONAME ; void CPhoneStateInCall::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+	?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)
+	?PhoneEngine@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@XZ @ 18 NONAME ; class MPEPhoneModel * CPhoneStateMachine::PhoneEngine(void)
+	?OpenMenuBarL@CPhoneStateCallSetup@@MAEXXZ @ 19 NONAME ; void CPhoneStateCallSetup::OpenMenuBarL(void)
+	??1CPhoneStateCallSetup@@UAE@XZ @ 20 NONAME ; CPhoneStateCallSetup::~CPhoneStateCallSetup(void)
+	?HandleEnvironmentChangeL@CPhoneUIController@@UAEXH@Z @ 21 NONAME ; void CPhoneUIController::HandleEnvironmentChangeL(int)
+	?SetToolbarButtonLoudspeakerEnabled@CPhoneState@@IAEXXZ @ 22 NONAME ; void CPhoneState::SetToolbarButtonLoudspeakerEnabled(void)
+	?Instance@CPhoneStateHandle@@SAPAV1@XZ @ 23 NONAME ; class CPhoneStateHandle * CPhoneStateHandle::Instance(void)
+	?HandleNumberEntryClearedL@CPhoneStateIdle@@MAEXXZ @ 24 NONAME ; void CPhoneStateIdle::HandleNumberEntryClearedL(void)
+	?DynInitMenuPaneL@CPhoneStateIncoming@@MAEXHPAVCEikMenuPane@@@Z @ 25 NONAME ; void CPhoneStateIncoming::DynInitMenuPaneL(int, class CEikMenuPane *)
+	?HandleCommandL@CPhoneState@@UAEHH@Z @ 26 NONAME ; int CPhoneState::HandleCommandL(int)
+	?StartAlsLineChangeTimerL@CPhoneState@@IAEXXZ @ 27 NONAME ; void CPhoneState::StartAlsLineChangeTimerL(void)
+	?IsNumberEntryVisibleL@CPhoneState@@QAEHXZ @ 28 NONAME ; int CPhoneState::IsNumberEntryVisibleL(void)
+	?HandlePhoneEngineMessageL@CPhoneStateIdle@@UAEXHH@Z @ 29 NONAME ; void CPhoneStateIdle::HandlePhoneEngineMessageL(int, int)
+	?HandleDialingL@CPhoneStateIdle@@MAEXH@Z @ 30 NONAME ; void CPhoneStateIdle::HandleDialingL(int)
+	?CustomizedDialerCbaResourceIdL@CPhoneState@@IAEHXZ @ 31 NONAME ; int CPhoneState::CustomizedDialerCbaResourceIdL(void)
+	?CaptureKeysDuringCallNotificationL@CPhoneState@@IAEXH@Z @ 32 NONAME ; void CPhoneState::CaptureKeysDuringCallNotificationL(int)
+	?HandleKeyPressDurationL@CPhoneState@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 33 NONAME ; void CPhoneState::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
+	?ChangeState@CPhoneStateMachine@@UAEXH@Z @ 34 NONAME ; void CPhoneStateMachine::ChangeState(int)
+	?IsSimStateNotPresentWithSecurityModeEnabled@CPhoneState@@IAEHXZ @ 35 NONAME ; int CPhoneState::IsSimStateNotPresentWithSecurityModeEnabled(void)
+	?HandlePhoneEngineMessageL@CPhoneState@@UAEXHH@Z @ 36 NONAME ; void CPhoneState::HandlePhoneEngineMessageL(int, int)
+	?HandleNumberEntryClearedL@CPhoneStateIncoming@@UAEXXZ @ 37 NONAME ; void CPhoneStateIncoming::HandleNumberEntryClearedL(void)
+	?HandleKeyEventL@CPhoneUIController@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 38 NONAME ; enum TKeyResponse CPhoneUIController::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?HandleRemConCommandL@CPhoneStateIdle@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 39 NONAME ; int CPhoneStateIdle::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+	?HandleAudioPlayStoppedL@CPhoneStateIncoming@@MAEXXZ @ 40 NONAME ; void CPhoneStateIncoming::HandleAudioPlayStoppedL(void)
+	?HandleCenRepChangeL@CPhoneState@@UAEXABVTUid@@I@Z @ 41 NONAME ; void CPhoneState::HandleCenRepChangeL(class TUid const &, unsigned int)
+	?HandleLongHashL@CPhoneState@@UAEXXZ @ 42 NONAME ; void CPhoneState::HandleLongHashL(void)
+	?DialL@CPhoneStateIdle@@MAEXABVTDesC16@@W4TPhoneNumberType@@W4TDialInitiationMethod@1@@Z @ 43 NONAME ; void CPhoneStateIdle::DialL(class TDesC16 const &, enum TPhoneNumberType, enum CPhoneStateIdle::TDialInitiationMethod)
+	?ShowNumberBusyNoteL@CPhoneState@@IAEXXZ @ 44 NONAME ; void CPhoneState::ShowNumberBusyNoteL(void)
+	?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 45 NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(void)
+	?HandleIdleForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 46 NONAME ; void CPhoneStateIdle::HandleIdleForegroundEventL(void)
+	?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 47 NONAME ; void CPhoneState::HandleDisconnectingL(int)
+	?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 48 NONAME ; void CPhoneState::HandleAudioMuteChangedL(void)
+	?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 49 NONAME ; int CPhoneStateIncoming::HandleCommandL(int)
+	?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 50 NONAME ; void CPhoneState::UpdateSingleActiveCallL(int)
+	?IsOnScreenDialerSupported@CPhoneState@@IBEHXZ @ 51 NONAME ; int CPhoneState::IsOnScreenDialerSupported(void) const
+	?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 52 NONAME ; enum TPESimState CPhoneState::SimState(void) const
+	?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 53 NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?SetupIdleScreenInBackgroundL@CPhoneState@@IAEXXZ @ 54 NONAME ; void CPhoneState::SetupIdleScreenInBackgroundL(void)
+	?SendGlobalWarningNoteL@CPhoneState@@IAEXH@Z @ 55 NONAME ; void CPhoneState::SendGlobalWarningNoteL(int)
+	?CompleteSatRequestL@CPhoneState@@IAEXH@Z @ 56 NONAME ; void CPhoneState::CompleteSatRequestL(int)
+	?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 57 NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?LaunchNewCallQueryL@CPhoneStateInCall@@IAEXXZ @ 58 NONAME ; void CPhoneStateInCall::LaunchNewCallQueryL(void)
+	?SetCallHeaderTextsForCallComingInL@CPhoneState@@IAEXHHPAVTPhoneCmdParamCallHeaderData@@@Z @ 59 NONAME ; void CPhoneState::SetCallHeaderTextsForCallComingInL(int, int, class TPhoneCmdParamCallHeaderData *)
+	?IsSimOk@CPhoneState@@QAEHXZ @ 60 NONAME ; int CPhoneState::IsSimOk(void)
+	?ClearNumberEntryContentCache@CPhoneState@@IAEXXZ @ 61 NONAME ; void CPhoneState::ClearNumberEntryContentCache(void)
+	?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 62 NONAME ; int CPhoneStateIdle::HandleCommandL(int)
+	?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 63 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void)
+	?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 64 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void)
+	?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 65 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void)
+	?IsKeyLockOn@CPhoneState@@MBEHXZ @ 66 NONAME ; int CPhoneState::IsKeyLockOn(void) const
+	??1CPhoneStateInCall@@UAE@XZ @ 67 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void)
+	?CustomizedDialerMenuResourceIdL@CPhoneState@@IAEHXZ @ 68 NONAME ; int CPhoneState::CustomizedDialerMenuResourceIdL(void)
+	?ShowReconnectQueryL@CPhoneReconnectQuery@@QAEXH@Z @ 69 NONAME ; void CPhoneReconnectQuery::ShowReconnectQueryL(int)
+	?UpdateSilenceButtonDimming@CPhoneState@@IAEXXZ @ 70 NONAME ; void CPhoneState::UpdateSilenceButtonDimming(void)
+	?SetNumberEntryVisibilityL@CPhoneState@@IAEXH@Z @ 71 NONAME ; void CPhoneState::SetNumberEntryVisibilityL(int)
+	?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 72 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &)
+	?ConstructL@CPhoneStateInCall@@MAEXXZ @ 73 NONAME ; void CPhoneStateInCall::ConstructL(void)
+	?OnlyHashInNumberEntryL@CPhoneStateIdle@@MAEXXZ @ 74 NONAME ; void CPhoneStateIdle::OnlyHashInNumberEntryL(void)
+	?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 75 NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void)
+	?HandlePhoneForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 76 NONAME ; void CPhoneStateIdle::HandlePhoneForegroundEventL(void)
+	?CloseDtmfQueryL@CPhoneStateInCall@@IAEXXZ @ 77 NONAME ; void CPhoneStateInCall::CloseDtmfQueryL(void)
+	?DynInitMenuBarL@CPhoneState@@UAEXHPAVCEikMenuBar@@@Z @ 78 NONAME ; void CPhoneState::DynInitMenuBarL(int, class CEikMenuBar *)
+	?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 79 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
+	?HandleNumberEntryEdited@CPhoneState@@MAEXXZ @ 80 NONAME ; void CPhoneState::HandleNumberEntryEdited(void)
+	?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 81 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int)
+	?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 82 NONAME ; void CPhoneState::DialMultimediaCallL(void)
+	?NewL@CPhoneUIController@@SAPAV1@PAVMPhoneViewCommandHandle@@@Z @ 83 NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class MPhoneViewCommandHandle *)
+	?HandleCreateNumberEntryL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 84 NONAME ; void CPhoneStateStartup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
+	?IsMenuBarVisibleL@CPhoneState@@UBEHXZ @ 85 NONAME ; int CPhoneState::IsMenuBarVisibleL(void) const
+	?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 86 NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &)
+	?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 87 NONAME ; int CPhoneStateCallSetup::HandleCommandL(int)
+	?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 88 NONAME ; void CPhoneState::HandleAudioOutputChangedL(void)
+	??1CPhoneUIController@@UAE@XZ @ 89 NONAME ; CPhoneUIController::~CPhoneUIController(void)
+	?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 90 NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?UpdateIncomingContextMenuL@CPhoneState@@MAEXH@Z @ 91 NONAME ; void CPhoneState::UpdateIncomingContextMenuL(int)
+	?OpenMenuBarL@CPhoneStateInCall@@MAEXXZ @ 92 NONAME ; void CPhoneStateInCall::OpenMenuBarL(void)
+	?UpdateIncomingCbaL@CPhoneCbaManager@@QAEXH@Z @ 93 NONAME ; void CPhoneCbaManager::UpdateIncomingCbaL(int)
+	?SetTouchPaneButtonDisabled@CPhoneState@@IAEXH@Z @ 94 NONAME ; void CPhoneState::SetTouchPaneButtonDisabled(int)
+	?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 95 NONAME ; void CPhoneStateIncoming::ConstructL(void)
+	?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 96 NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &)
+	?SetTouchPaneButtons@CPhoneState@@IAEXH@Z @ 97 NONAME ; void CPhoneState::SetTouchPaneButtons(int)
+	?HandleIdleForegroundEventL@CPhoneStateStartup@@UAEXXZ @ 98 NONAME ; void CPhoneStateStartup::HandleIdleForegroundEventL(void)
+	?CallFromNumberEntryL@CPhoneState@@IAEXXZ @ 99 NONAME ; void CPhoneState::CallFromNumberEntryL(void)
+	?UpdateCbaL@CPhoneCbaManager@@QAEXH@Z @ 100 NONAME ; void CPhoneCbaManager::UpdateCbaL(int)
+	?IsVideoCall@CPhoneState@@IAEHH@Z @ 101 NONAME ; int CPhoneState::IsVideoCall(int)
+	?IsSwivelClosed@CPhoneState@@QBEHXZ @ 102 NONAME ; int CPhoneState::IsSwivelClosed(void) const
+	?CloseCustomizedDialerL@CPhoneState@@QAEXXZ @ 103 NONAME ; void CPhoneState::CloseCustomizedDialerL(void)
+	?HandlePhoneForegroundEventL@CPhoneUIController@@UAEXXZ @ 104 NONAME ; void CPhoneUIController::HandlePhoneForegroundEventL(void)
+	?CheckIfRestoreNEContentAfterDtmfDialer@CPhoneState@@IAEXXZ @ 105 NONAME ; void CPhoneState::CheckIfRestoreNEContentAfterDtmfDialer(void)
+	?UpdateInCallContextMenuL@CPhoneState@@UAEXXZ @ 106 NONAME ; void CPhoneState::UpdateInCallContextMenuL(void)
+	?HandleNumericKeyEventL@CPhoneState@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 107 NONAME ; void CPhoneState::HandleNumericKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?SetToolbarDimming@CPhoneState@@IAEXH@Z @ 108 NONAME ; void CPhoneState::SetToolbarDimming(int)
+	?SendGlobalErrorNoteL@CPhoneState@@QAEXH@Z @ 109 NONAME ; void CPhoneState::SendGlobalErrorNoteL(int)
+	?IsAutoLockOn@CPhoneState@@UBEHXZ @ 110 NONAME ; int CPhoneState::IsAutoLockOn(void) const
+	?UpdateCbaL@CPhoneStateCallSetup@@MAEXH@Z @ 111 NONAME ; void CPhoneStateCallSetup::UpdateCbaL(int)
+	?RestoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 112 NONAME ; void CPhoneState::RestoreNumberEntryContentL(void)
+	?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 113 NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?IsNumberEntryContentStored@CPhoneState@@IAEHXZ @ 114 NONAME ; int CPhoneState::IsNumberEntryContentStored(void)
+	?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 115 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void)
+	?DialVoiceCallL@CPhoneState@@IAEXXZ @ 116 NONAME ; void CPhoneState::DialVoiceCallL(void)
+	?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 117 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void)
+	?EndUiUpdate@CPhoneState@@IAEXXZ @ 118 NONAME ; void CPhoneState::EndUiUpdate(void)
+	?HandleKeyPressDurationL@CPhoneStateIncoming@@UAEXW4TKeyCode@@VTTimeIntervalMicroSeconds@@@Z @ 119 NONAME ; void CPhoneStateIncoming::HandleKeyPressDurationL(enum TKeyCode, class TTimeIntervalMicroSeconds)
+	?UpdateInCallCbaL@CPhoneStateInCall@@MAEXXZ @ 120 NONAME ; void CPhoneStateInCall::UpdateInCallCbaL(void)
+	?EndTransEffect@CPhoneState@@QAEXXZ @ 121 NONAME ; void CPhoneState::EndTransEffect(void)
+	?HandleEnvironmentChangeL@CPhoneState@@UAEXH@Z @ 122 NONAME ; void CPhoneState::HandleEnvironmentChangeL(int)
+	?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 123 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 124 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int)
+	?ProcessCommandL@CPhoneState@@UAEHH@Z @ 125 NONAME ; int CPhoneState::ProcessCommandL(int)
+	?BeginUiUpdateLC@CPhoneState@@IAEXXZ @ 126 NONAME ; void CPhoneState::BeginUiUpdateLC(void)
+	?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 127 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void)
+	?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 128 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void)
+	?CreateNumberEntryL@CPhoneStateInCall@@IAEXXZ @ 129 NONAME ; void CPhoneStateInCall::CreateNumberEntryL(void)
+	?HandleSystemEventL@CPhoneUIController@@UAEXABVTWsEvent@@@Z @ 130 NONAME ; void CPhoneUIController::HandleSystemEventL(class TWsEvent const &)
+	?DynInitMenuPaneL@CPhoneUIController@@UAEXHPAVCEikMenuPane@@@Z @ 131 NONAME ; void CPhoneUIController::DynInitMenuPaneL(int, class CEikMenuPane *)
+	??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 132 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?GetRemoteInfoDataL@CPhoneState@@IAEXHAAVTDes16@@@Z @ 133 NONAME ; void CPhoneState::GetRemoteInfoDataL(int, class TDes16 &)
+	?SetDivertIndication@CPhoneState@@UAEXH@Z @ 134 NONAME ; void CPhoneState::SetDivertIndication(int)
+	?UpdateCbaL@CPhoneStateInCall@@MAEXH@Z @ 135 NONAME ; void CPhoneStateInCall::UpdateCbaL(int)
+	?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 136 NONAME ; void CPhoneStateMachine::SetCallId(int)
+	?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 137 NONAME ; int CPhoneUIController::ProcessCommandL(int)
+	?DisplayHeaderForCallComingInL@CPhoneState@@IAEXHH@Z @ 138 NONAME ; void CPhoneState::DisplayHeaderForCallComingInL(int, int)
+	??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 139 NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 140 NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int)
+	??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 141 NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 142 NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 143 NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
+	?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 144 NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?HandlePEConstructionReadyL@CPhoneStateStartup@@QAEXH@Z @ 145 NONAME ; void CPhoneStateStartup::HandlePEConstructionReadyL(int)
+	?HandleForegroundEventL@CPhoneUIController@@UAEXH@Z @ 146 NONAME ; void CPhoneUIController::HandleForegroundEventL(int)
+	?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 147 NONAME ; void CPhoneStateIdle::HandleSendCommandL(void)
+	?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 148 NONAME ; int CPhoneUIController::HandleCommandL(int)
+	?HandleCreateNumberEntryL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 149 NONAME ; void CPhoneState::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
+	?DisplayHeaderForOutgoingCallL@CPhoneState@@IAEXH@Z @ 150 NONAME ; void CPhoneState::DisplayHeaderForOutgoingCallL(int)
+	?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 151 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int)
+	?IsSpeedDialNumber@CPhoneStateIdle@@IBEHABVTDesC16@@@Z @ 152 NONAME ; int CPhoneStateIdle::IsSpeedDialNumber(class TDesC16 const &) const
+	?IsNumberEntryUsedL@CPhoneState@@UAEHXZ @ 153 NONAME ; int CPhoneState::IsNumberEntryUsedL(void)
+	??1CPhoneState@@UAE@XZ @ 154 NONAME ; CPhoneState::~CPhoneState(void)
+	?HandleCreateNumberEntryL@CPhoneStateCallSetup@@MAEXABUTKeyEvent@@W4TEventCode@@@Z @ 155 NONAME ; void CPhoneStateCallSetup::HandleCreateNumberEntryL(struct TKeyEvent const &, enum TEventCode)
+	?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 156 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int)
+	?HandlePhoneFocusLostEventL@CPhoneState@@UAEXXZ @ 157 NONAME ; void CPhoneState::HandlePhoneFocusLostEventL(void)
+	?HandlePropertyChangedL@CPhoneStateInCall@@EAEXABVTUid@@IH@Z @ 158 NONAME ; void CPhoneStateInCall::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+	??1CPhoneStateMachine@@UAE@XZ @ 159 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void)
+	?HandleIdleForegroundEventL@CPhoneState@@UAEXXZ @ 160 NONAME ; void CPhoneState::HandleIdleForegroundEventL(void)
+	?DynInitMenuPaneL@CPhoneState@@UAEXHPAVCEikMenuPane@@@Z @ 161 NONAME ; void CPhoneState::DynInitMenuPaneL(int, class CEikMenuPane *)
+	?IsDTMFEditorVisibleL@CPhoneState@@IBEHXZ @ 162 NONAME ; int CPhoneState::IsDTMFEditorVisibleL(void) const
+	?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 163 NONAME ; void CPhoneStateCallSetup::ConstructL(void)
+	?BeginTransEffectLC@CPhoneState@@QAEXW4TStateTransEffectType@@@Z @ 164 NONAME ; void CPhoneState::BeginTransEffectLC(enum TStateTransEffectType)
+	?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 165 NONAME ; void CPhoneUIController::HandleMessage(int, int)
+	?HandleSystemEventL@CPhoneState@@UAEXABVTWsEvent@@@Z @ 166 NONAME ; void CPhoneState::HandleSystemEventL(class TWsEvent const &)
+	?NeedToReturnToForegroundAppL@CPhoneState@@IBEHXZ @ 167 NONAME ; int CPhoneState::NeedToReturnToForegroundAppL(void) const
+	?DisplayCallSetupL@CPhoneStateIdle@@IAEXH@Z @ 168 NONAME ; void CPhoneStateIdle::DisplayCallSetupL(int)
+	?ConstructL@CPhoneStateStartup@@MAEXXZ @ 169 NONAME ; void CPhoneStateStartup::ConstructL(void)
+	?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 170 NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?ShowNoteL@CPhoneState@@IAEXH@Z @ 171 NONAME ; void CPhoneState::ShowNoteL(int)
+	?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 172 NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+	?IsAnyQueryActiveL@CPhoneState@@QAEHXZ @ 173 NONAME ; int CPhoneState::IsAnyQueryActiveL(void)
+	?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 174 NONAME ; class MPhoneState * CPhoneStateMachine::State(void)
+	?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 175 NONAME ; void CPhoneState::SetHandsfreeModeL(int)
+	?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 176 NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const
+	?UpdateInCallCbaL@CPhoneStateCallSetup@@MAEXXZ @ 177 NONAME ; void CPhoneStateCallSetup::UpdateInCallCbaL(void)
+	?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 178 NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void)
+	??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 179 NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	??1CPhoneStateIncoming@@UAE@XZ @ 180 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void)
+	?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 181 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void)
+	?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 182 NONAME ; int CPhoneStateIdle::ProcessCommandL(int)
+	?IsNoteVisibleL@CPhoneState@@MAEHXZ @ 183 NONAME ; int CPhoneState::IsNoteVisibleL(void)
+	?DynInitMenuBarL@CPhoneUIController@@UAEXHPAVCEikMenuBar@@@Z @ 184 NONAME ; void CPhoneUIController::DynInitMenuBarL(int, class CEikMenuBar *)
+	?IsAlphanumericSupportedAndCharInput@CPhoneState@@MAEHABUTKeyEvent@@@Z @ 185 NONAME ; int CPhoneState::IsAlphanumericSupportedAndCharInput(struct TKeyEvent const &)
+	?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 186 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int)
+	?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 187 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 188 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+	?HandleNumberEntryClearedL@CPhoneState@@MAEXXZ @ 189 NONAME ; void CPhoneState::HandleNumberEntryClearedL(void)
+	?OnlyHashInNumberEntryL@CPhoneState@@MAEXXZ @ 190 NONAME ; void CPhoneState::OnlyHashInNumberEntryL(void)
+	?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 191 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void)
+	?ConstructL@CPhoneStateIdle@@MAEXXZ @ 192 NONAME ; void CPhoneStateIdle::ConstructL(void)
+	?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 193 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void)
+	?SetCallHeaderType@CPhoneState@@IAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 194 NONAME ; void CPhoneState::SetCallHeaderType(enum CBubbleManager::TPhoneCallTypeFlags)
+	?SendGlobalInfoNoteL@CPhoneState@@QAEXH@Z @ 195 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int)
+	?DisplayIdleScreenL@CPhoneState@@IAEXXZ @ 196 NONAME ; void CPhoneState::DisplayIdleScreenL(void)
+	?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 197 NONAME ; void CPhoneState::StartShowSecurityNoteL(void)
+	?StoreNumberEntryContentL@CPhoneState@@IAEXXZ @ 198 NONAME ; void CPhoneState::StoreNumberEntryContentL(void)
+	?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 199 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int)
+	?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 200 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int)
+	?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 201 NONAME ; void CPhoneState::SetDefaultFlagsL(void)
+	?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 202 NONAME ; int CPhoneStateInCall::HandleCommandL(int)
+	?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 203 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void)
+	?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 204 NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int)
+	?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 205 NONAME ; int CPhoneStateInCall::GetRingingCallL(void)
+	?HandleIdleForegroundEventL@CPhoneUIController@@UAEXXZ @ 206 NONAME ; void CPhoneUIController::HandleIdleForegroundEventL(void)
+	?HandlePhoneForegroundEventL@CPhoneState@@UAEXXZ @ 207 NONAME ; void CPhoneState::HandlePhoneForegroundEventL(void)
+	?HandleForegroundEventL@CPhoneState@@UAEXH@Z @ 208 NONAME ; void CPhoneState::HandleForegroundEventL(int)
+	?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 209 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
+	?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 210 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+	??1CPhoneStateIdle@@UAE@XZ @ 211 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
+	?IsDialingExtensionInFocusL@CPhoneState@@QBEHXZ @ 212 NONAME ; int CPhoneState::IsDialingExtensionInFocusL(void) const
+	?PhoneNumberFromEntryLC@CPhoneState@@IAEPAVHBufC16@@XZ @ 213 NONAME ; class HBufC16 * CPhoneState::PhoneNumberFromEntryLC(void)
+	?BaseConstructL@CPhoneState@@QAEXXZ @ 214 NONAME ; void CPhoneState::BaseConstructL(void)
+	?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 215 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
+	?SpeedDialL@CPhoneStateIdle@@IAEXABIW4TDialInitiationMethod@1@@Z @ 216 NONAME ; void CPhoneStateIdle::SpeedDialL(unsigned int const &, enum CPhoneStateIdle::TDialInitiationMethod)
+	?SetTouchPaneButtonEnabled@CPhoneState@@IAEXH@Z @ 217 NONAME ; void CPhoneState::SetTouchPaneButtonEnabled(int)
+	?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 218 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
+	?SpeedDialCanceledL@CPhoneStateIdle@@IAEXABI@Z @ 219 NONAME ; void CPhoneStateIdle::SpeedDialCanceledL(unsigned int const &)
+	?CloseDTMFEditorL@CPhoneState@@IAEXXZ @ 220 NONAME ; void CPhoneState::CloseDTMFEditorL(void)
+	?SetTouchPaneVisible@CPhoneState@@IAEXH@Z @ 221 NONAME ; void CPhoneState::SetTouchPaneVisible(int)
+	?HandlePhoneFocusLostEventL@CPhoneUIController@@UAEXXZ @ 222 NONAME ; void CPhoneUIController::HandlePhoneFocusLostEventL(void)
+	??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 223 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
+	??1CPhoneStateStartup@@UAE@XZ @ 224 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
+	?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 225 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
 
--- a/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def	Mon Mar 15 12:40:24 2010 +0200
@@ -3,473 +3,457 @@
 	_ZN11CPhoneState11EndUiUpdateEv @ 2 NONAME
 	_ZN11CPhoneState11IsVideoCallEi @ 3 NONAME
 	_ZN11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 4 NONAME
-	_ZN11CPhoneState13EnableCallUILEv @ 5 NONAME
-	_ZN11CPhoneState14BaseConstructLEv @ 6 NONAME
-	_ZN11CPhoneState14DialVoiceCallLEv @ 7 NONAME
-	_ZN11CPhoneState14DisableCallUILEv @ 8 NONAME
-	_ZN11CPhoneState14DisableHWKeysLEv @ 9 NONAME
-	_ZN11CPhoneState14EndTransEffectEv @ 10 NONAME
-	_ZN11CPhoneState14HandleCommandLEi @ 11 NONAME
-	_ZN11CPhoneState14IsNoteVisibleLEv @ 12 NONAME
-	_ZN11CPhoneState14ShowTextQueryLEiiiP6TDes16i @ 13 NONAME
-	_ZN11CPhoneState15BeginUiUpdateLCEv @ 14 NONAME
-	_ZN11CPhoneState15DisconnectCallLEv @ 15 NONAME
-	_ZN11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 16 NONAME
-	_ZN11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 17 NONAME
-	_ZN11CPhoneState15HandleLongHashLEv @ 18 NONAME
-	_ZN11CPhoneState15ProcessCommandLEi @ 19 NONAME
-	_ZN11CPhoneState15SetContextMenuLEi @ 20 NONAME
-	_ZN11CPhoneState16CallWaitingNoteLEi @ 21 NONAME
-	_ZN11CPhoneState16CloseDTMFEditorLEv @ 22 NONAME
-	_ZN11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 23 NONAME
-	_ZN11CPhoneState16SetDefaultFlagsLEv @ 24 NONAME
-	_ZN11CPhoneState17HandleHoldSwitchLEv @ 25 NONAME
-	_ZN11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 26 NONAME
-	_ZN11CPhoneState17IsAnyQueryActiveLEv @ 27 NONAME
-	_ZN11CPhoneState17SetCallHeaderTypeEN14CBubbleManager19TPhoneCallTypeFlagsE @ 28 NONAME
-	_ZN11CPhoneState17SetHandsfreeModeLEi @ 29 NONAME
-	_ZN11CPhoneState17SetToolbarDimmingEi @ 30 NONAME
-	_ZN11CPhoneState18BeginTransEffectLCE21TStateTransEffectType @ 31 NONAME
-	_ZN11CPhoneState18DisplayIdleScreenLEv @ 32 NONAME
-	_ZN11CPhoneState18GetRemoteInfoDataLEiR6TDes16 @ 33 NONAME
-	_ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 34 NONAME
-	_ZN11CPhoneState18HandleSystemEventLERK8TWsEvent @ 35 NONAME
-	_ZN11CPhoneState18IsNumberEntryUsedLEv @ 36 NONAME
-	_ZN11CPhoneState19CompleteSatRequestLEi @ 37 NONAME
-	_ZN11CPhoneState19DialMultimediaCallLEv @ 38 NONAME
-	_ZN11CPhoneState19HandleCenRepChangeLERK4TUidj @ 39 NONAME
-	_ZN11CPhoneState19HandlePhoneStartupLEv @ 40 NONAME
-	_ZN11CPhoneState19SendGlobalInfoNoteLEi @ 41 NONAME
-	_ZN11CPhoneState19SetBTHandsfreeModeLEi @ 42 NONAME
-	_ZN11CPhoneState19SetDivertIndicationEi @ 43 NONAME
-	_ZN11CPhoneState19SetTouchPaneButtonsEi @ 44 NONAME
-	_ZN11CPhoneState19SetTouchPaneVisibleEi @ 45 NONAME
-	_ZN11CPhoneState19ShowNumberBusyNoteLEv @ 46 NONAME
-	_ZN11CPhoneState20CallFromNumberEntryLEv @ 47 NONAME
-	_ZN11CPhoneState20DecreaseAudioVolumeLEv @ 48 NONAME
-	_ZN11CPhoneState20HandleDisconnectingLEi @ 49 NONAME
-	_ZN11CPhoneState20HandleKeyLockEnabledEi @ 50 NONAME
-	_ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 51 NONAME
-	_ZN11CPhoneState20IncreaseAudioVolumeLEv @ 52 NONAME
-	_ZN11CPhoneState20SendGlobalErrorNoteLEi @ 53 NONAME
-	_ZN11CPhoneState21IsNumberEntryVisibleLEv @ 54 NONAME
-	_ZN11CPhoneState21UpdateRemoteInfoDataLEi @ 55 NONAME
-	_ZN11CPhoneState22CloseCustomizedDialerLEv @ 56 NONAME
-	_ZN11CPhoneState22DeleteTouchPaneButtonsEv @ 57 NONAME
-	_ZN11CPhoneState22HandleForegroundEventLEi @ 58 NONAME
-	_ZN11CPhoneState22HandleNumericKeyEventLERK9TKeyEvent10TEventCode @ 59 NONAME
-	_ZN11CPhoneState22HandlePropertyChangedLERK4TUidji @ 60 NONAME
-	_ZN11CPhoneState22OnlyHashInNumberEntryLEv @ 61 NONAME
-	_ZN11CPhoneState22PhoneNumberFromEntryLCEv @ 62 NONAME
-	_ZN11CPhoneState22SendGlobalWarningNoteLEi @ 63 NONAME
-	_ZN11CPhoneState22StartShowSecurityNoteLEv @ 64 NONAME
-	_ZN11CPhoneState23HandleAudioMuteChangedLEv @ 65 NONAME
-	_ZN11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 66 NONAME
-	_ZN11CPhoneState23HandleNumberEntryEditedEv @ 67 NONAME
-	_ZN11CPhoneState23SetRingingTonePlaybackLEi @ 68 NONAME
-	_ZN11CPhoneState23UpdateSingleActiveCallLEi @ 69 NONAME
-	_ZN11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 70 NONAME
-	_ZN11CPhoneState24HandleEnvironmentChangeLEi @ 71 NONAME
-	_ZN11CPhoneState24StartAlsLineChangeTimerLEv @ 72 NONAME
-	_ZN11CPhoneState24StoreNumberEntryContentLEv @ 73 NONAME
-	_ZN11CPhoneState24UpdateInCallContextMenuLEv @ 74 NONAME
-	_ZN11CPhoneState25HandleAudioOutputChangedLEv @ 75 NONAME
-	_ZN11CPhoneState25HandleNumberEntryClearedLEv @ 76 NONAME
-	_ZN11CPhoneState25HandlePhoneEngineMessageLEii @ 77 NONAME
-	_ZN11CPhoneState25SetNumberEntryVisibilityLEi @ 78 NONAME
-	_ZN11CPhoneState25SetTouchPaneButtonEnabledEi @ 79 NONAME
-	_ZN11CPhoneState26HandleIdleForegroundEventLEv @ 80 NONAME
-	_ZN11CPhoneState26HandlePhoneFocusLostEventLEv @ 81 NONAME
-	_ZN11CPhoneState26IsNumberEntryContentStoredEv @ 82 NONAME
-	_ZN11CPhoneState26RestoreNumberEntryContentLEv @ 83 NONAME
-	_ZN11CPhoneState26SetTouchPaneButtonDisabledEi @ 84 NONAME
-	_ZN11CPhoneState26UpdateIncomingContextMenuLEi @ 85 NONAME
-	_ZN11CPhoneState26UpdateSilenceButtonDimmingEv @ 86 NONAME
-	_ZN11CPhoneState27DisplayCallTerminationNoteLEv @ 87 NONAME
-	_ZN11CPhoneState27HandlePhoneForegroundEventLEv @ 88 NONAME
-	_ZN11CPhoneState27RetainPreviousKeylockStateLEv @ 89 NONAME
-	_ZN11CPhoneState28CheckDisableHWKeysAndCallUILEv @ 90 NONAME
-	_ZN11CPhoneState28ClearNumberEntryContentCacheEv @ 91 NONAME
-	_ZN11CPhoneState28SetupIdleScreenInBackgroundLEv @ 92 NONAME
-	_ZN11CPhoneState29DisplayHeaderForCallComingInLEii @ 93 NONAME
-	_ZN11CPhoneState29DisplayHeaderForOutgoingCallLEi @ 94 NONAME
-	_ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 95 NONAME
-	_ZN11CPhoneState30CustomizedDialerCbaResourceIdLEv @ 96 NONAME
-	_ZN11CPhoneState31CustomizedDialerMenuResourceIdLEv @ 97 NONAME
-	_ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 98 NONAME
-	_ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 99 NONAME
-	_ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 100 NONAME
-	_ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 101 NONAME
-	_ZN11CPhoneState38CheckIfRestoreNEContentAfterDtmfDialerEv @ 102 NONAME
-	_ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 103 NONAME
-	_ZN11CPhoneState7IsSimOkEv @ 104 NONAME
-	_ZN11CPhoneState9ShowNoteLEi @ 105 NONAME
-	_ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 106 NONAME
-	_ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 107 NONAME
-	_ZN11CPhoneStateD0Ev @ 108 NONAME
-	_ZN11CPhoneStateD1Ev @ 109 NONAME
-	_ZN11CPhoneStateD2Ev @ 110 NONAME
-	_ZN15CPhoneStateIdle10ConstructLEv @ 111 NONAME
-	_ZN15CPhoneStateIdle10SpeedDialLERKjNS_21TDialInitiationMethodE @ 112 NONAME
-	_ZN15CPhoneStateIdle14DialVoiceCallLEv @ 113 NONAME
-	_ZN15CPhoneStateIdle14HandleCommandLEi @ 114 NONAME
-	_ZN15CPhoneStateIdle14HandleDialingLEi @ 115 NONAME
-	_ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 116 NONAME
-	_ZN15CPhoneStateIdle15ProcessCommandLEi @ 117 NONAME
-	_ZN15CPhoneStateIdle17DisplayCallSetupLEi @ 118 NONAME
-	_ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 119 NONAME
-	_ZN15CPhoneStateIdle18HandleSendCommandLEv @ 120 NONAME
-	_ZN15CPhoneStateIdle18SpeedDialCanceledLERKj @ 121 NONAME
-	_ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 122 NONAME
-	_ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 123 NONAME
-	_ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 124 NONAME
-	_ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 125 NONAME
-	_ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 126 NONAME
-	_ZN15CPhoneStateIdle25HandleNumberLongKeyPressLEv @ 127 NONAME
-	_ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 128 NONAME
-	_ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 129 NONAME
-	_ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 130 NONAME
-	_ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 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
-	_ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 157 NONAME
-	_ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 158 NONAME
-	_ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 159 NONAME
-	_ZN17CPhoneStateInCall34PhoneNumberAvailableInPhoneEngineLEi @ 160 NONAME
-	_ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 161 NONAME
-	_ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 162 NONAME
-	_ZN17CPhoneStateInCallD0Ev @ 163 NONAME
-	_ZN17CPhoneStateInCallD1Ev @ 164 NONAME
-	_ZN17CPhoneStateInCallD2Ev @ 165 NONAME
-	_ZN18CPhoneStateMachine11ChangeStateEi @ 166 NONAME
-	_ZN18CPhoneStateMachine11PhoneEngineEv @ 167 NONAME
-	_ZN18CPhoneStateMachine12PhoneStorageEv @ 168 NONAME
-	_ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 169 NONAME
-	_ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 170 NONAME
-	_ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 171 NONAME
-	_ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 172 NONAME
-	_ZN18CPhoneStateMachine5StateEv @ 173 NONAME
-	_ZN18CPhoneStateMachine9SetCallIdEi @ 174 NONAME
-	_ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 175 NONAME
-	_ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 176 NONAME
-	_ZN18CPhoneStateMachineD0Ev @ 177 NONAME
-	_ZN18CPhoneStateMachineD1Ev @ 178 NONAME
-	_ZN18CPhoneStateMachineD2Ev @ 179 NONAME
-	_ZN18CPhoneStateStartup10ConstructLEv @ 180 NONAME
-	_ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 181 NONAME
-	_ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 182 NONAME
-	_ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 183 NONAME
-	_ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 184 NONAME
-	_ZN18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 185 NONAME
-	_ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 186 NONAME
-	_ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 187 NONAME
-	_ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 188 NONAME
-	_ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 189 NONAME
-	_ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 190 NONAME
-	_ZN18CPhoneStateStartupD0Ev @ 191 NONAME
-	_ZN18CPhoneStateStartupD1Ev @ 192 NONAME
-	_ZN18CPhoneStateStartupD2Ev @ 193 NONAME
-	_ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 194 NONAME
-	_ZN18CPhoneUIController13HandleMessageEii @ 195 NONAME
-	_ZN18CPhoneUIController14HandleCommandLEi @ 196 NONAME
-	_ZN18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 197 NONAME
-	_ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 198 NONAME
-	_ZN18CPhoneUIController15ProcessCommandLEi @ 199 NONAME
-	_ZN18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 200 NONAME
-	_ZN18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 201 NONAME
-	_ZN18CPhoneUIController19HandlePhoneStartupLEv @ 202 NONAME
-	_ZN18CPhoneUIController20HandleKeyLockEnabledEi @ 203 NONAME
-	_ZN18CPhoneUIController22HandleForegroundEventLEi @ 204 NONAME
-	_ZN18CPhoneUIController24HandleEnvironmentChangeLEi @ 205 NONAME
-	_ZN18CPhoneUIController26HandleIdleForegroundEventLEv @ 206 NONAME
-	_ZN18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 207 NONAME
-	_ZN18CPhoneUIController27HandlePhoneForegroundEventLEv @ 208 NONAME
-	_ZN18CPhoneUIController4NewLEP23MPhoneViewCommandHandle @ 209 NONAME
-	_ZN18CPhoneUIControllerD0Ev @ 210 NONAME
-	_ZN18CPhoneUIControllerD1Ev @ 211 NONAME
-	_ZN18CPhoneUIControllerD2Ev @ 212 NONAME
-	_ZN19CPhoneStateIncoming10ConstructLEv @ 213 NONAME
-	_ZN19CPhoneStateIncoming14HandleCommandLEi @ 214 NONAME
-	_ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 215 NONAME
-	_ZN19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 216 NONAME
-	_ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 217 NONAME
-	_ZN19CPhoneStateIncoming20HandleKeyLockEnabledEi @ 218 NONAME
-	_ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 219 NONAME
-	_ZN19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 220 NONAME
-	_ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 221 NONAME
-	_ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 222 NONAME
-	_ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 223 NONAME
-	_ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 224 NONAME
-	_ZN19CPhoneStateIncomingD0Ev @ 225 NONAME
-	_ZN19CPhoneStateIncomingD1Ev @ 226 NONAME
-	_ZN19CPhoneStateIncomingD2Ev @ 227 NONAME
-	_ZN20CPhoneReconnectQuery19ShowReconnectQueryLEi @ 228 NONAME
-	_ZN20CPhoneReconnectQuery9InstanceLEv @ 229 NONAME
-	_ZN20CPhoneStateCallSetup10ConstructLEv @ 230 NONAME
-	_ZN20CPhoneStateCallSetup10UpdateCbaLEi @ 231 NONAME
-	_ZN20CPhoneStateCallSetup12OpenMenuBarLEv @ 232 NONAME
-	_ZN20CPhoneStateCallSetup14HandleCommandLEi @ 233 NONAME
-	_ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 234 NONAME
-	_ZN20CPhoneStateCallSetup16UpdateInCallCbaLEv @ 235 NONAME
-	_ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 236 NONAME
-	_ZN20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 237 NONAME
-	_ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 238 NONAME
-	_ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 239 NONAME
-	_ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 240 NONAME
-	_ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 241 NONAME
-	_ZN20CPhoneStateCallSetupD0Ev @ 242 NONAME
-	_ZN20CPhoneStateCallSetupD1Ev @ 243 NONAME
-	_ZN20CPhoneStateCallSetupD2Ev @ 244 NONAME
-	_ZNK11CPhoneState11IsKeyLockOnEv @ 245 NONAME
-	_ZNK11CPhoneState12IsAutoLockOnEv @ 246 NONAME
-	_ZNK11CPhoneState14IsSwivelClosedEv @ 247 NONAME
-	_ZNK11CPhoneState17GetBlockedKeyListEv @ 248 NONAME
-	_ZNK11CPhoneState17IsMenuBarVisibleLEv @ 249 NONAME
-	_ZNK11CPhoneState18TopAppIsDisplayedLEv @ 250 NONAME
-	_ZNK11CPhoneState20IsDTMFEditorVisibleLEv @ 251 NONAME
-	_ZNK11CPhoneState25IsOnScreenDialerSupportedEv @ 252 NONAME
-	_ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 253 NONAME
-	_ZNK11CPhoneState26IsDialingExtensionInFocusLEv @ 254 NONAME
-	_ZNK11CPhoneState28NeedToReturnToForegroundAppLEv @ 255 NONAME
-	_ZNK11CPhoneState8SimStateEv @ 256 NONAME
-	_ZNK15CPhoneStateIdle17IsSpeedDialNumberERK7TDesC16 @ 257 NONAME
-	_ZTI11CPhoneState @ 258 NONAME
-	_ZTI15CPhoneStateIdle @ 259 NONAME
-	_ZTI17CPhoneStateHandle @ 260 NONAME
-	_ZTI17CPhoneStateInCall @ 261 NONAME
-	_ZTI18CPhoneStateMachine @ 262 NONAME
-	_ZTI18CPhoneStateStartup @ 263 NONAME
-	_ZTI18CPhoneUIController @ 264 NONAME
-	_ZTI19CPhoneStateIncoming @ 265 NONAME
-	_ZTI20CPhoneReconnectQuery @ 266 NONAME
-	_ZTI20CPhoneStateCallSetup @ 267 NONAME
-	_ZTI23CPhoneDtmfWaitCharTimer @ 268 NONAME
-	_ZTI23CPhoneKeyEventForwarder @ 269 NONAME
-	_ZTI24CPhoneSystemEventHandler @ 270 NONAME
-	_ZTI26CPhoneRemoteControlHandler @ 271 NONAME
-	_ZTI27CPhoneBtaaDisconnectHandler @ 272 NONAME
-	_ZTV11CPhoneState @ 273 NONAME
-	_ZTV15CPhoneStateIdle @ 274 NONAME
-	_ZTV17CPhoneStateHandle @ 275 NONAME
-	_ZTV17CPhoneStateInCall @ 276 NONAME
-	_ZTV18CPhoneStateMachine @ 277 NONAME
-	_ZTV18CPhoneStateStartup @ 278 NONAME
-	_ZTV18CPhoneUIController @ 279 NONAME
-	_ZTV19CPhoneStateIncoming @ 280 NONAME
-	_ZTV20CPhoneReconnectQuery @ 281 NONAME
-	_ZTV20CPhoneStateCallSetup @ 282 NONAME
-	_ZTV23CPhoneDtmfWaitCharTimer @ 283 NONAME
-	_ZTV23CPhoneKeyEventForwarder @ 284 NONAME
-	_ZTV24CPhoneSystemEventHandler @ 285 NONAME
-	_ZTV26CPhoneRemoteControlHandler @ 286 NONAME
-	_ZTV27CPhoneBtaaDisconnectHandler @ 287 NONAME
-	_ZThn12_N11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 288 NONAME
-	_ZThn12_N11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 289 NONAME
-	_ZThn12_N11CPhoneState18HandleSystemEventLERK8TWsEvent @ 290 NONAME
-	_ZThn12_N11CPhoneState19HandleCenRepChangeLERK4TUidj @ 291 NONAME
-	_ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 292 NONAME
-	_ZThn12_N11CPhoneState20HandleKeyLockEnabledEi @ 293 NONAME
-	_ZThn12_N11CPhoneState22HandleForegroundEventLEi @ 294 NONAME
-	_ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 295 NONAME
-	_ZThn12_N11CPhoneState24HandleEnvironmentChangeLEi @ 296 NONAME
-	_ZThn12_N11CPhoneState26HandleIdleForegroundEventLEv @ 297 NONAME
-	_ZThn12_N11CPhoneState26HandlePhoneFocusLostEventLEv @ 298 NONAME
-	_ZThn12_N11CPhoneState27HandlePhoneForegroundEventLEv @ 299 NONAME
-	_ZThn12_N11CPhoneStateD0Ev @ 300 NONAME
-	_ZThn12_N11CPhoneStateD1Ev @ 301 NONAME
-	_ZThn12_N15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 302 NONAME
-	_ZThn12_N15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 303 NONAME
-	_ZThn12_N15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 304 NONAME
-	_ZThn12_N15CPhoneStateIdleD0Ev @ 305 NONAME
-	_ZThn12_N15CPhoneStateIdleD1Ev @ 306 NONAME
-	_ZThn12_N17CPhoneStateInCallD0Ev @ 307 NONAME
-	_ZThn12_N17CPhoneStateInCallD1Ev @ 308 NONAME
-	_ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 309 NONAME
-	_ZThn12_N18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 310 NONAME
-	_ZThn12_N18CPhoneStateStartupD0Ev @ 311 NONAME
-	_ZThn12_N18CPhoneStateStartupD1Ev @ 312 NONAME
-	_ZThn12_N18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 313 NONAME
-	_ZThn12_N18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 314 NONAME
-	_ZThn12_N18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 315 NONAME
-	_ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 316 NONAME
-	_ZThn12_N18CPhoneUIController20HandleKeyLockEnabledEi @ 317 NONAME
-	_ZThn12_N18CPhoneUIController22HandleForegroundEventLEi @ 318 NONAME
-	_ZThn12_N18CPhoneUIController24HandleEnvironmentChangeLEi @ 319 NONAME
-	_ZThn12_N18CPhoneUIController26HandleIdleForegroundEventLEv @ 320 NONAME
-	_ZThn12_N18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 321 NONAME
-	_ZThn12_N18CPhoneUIController27HandlePhoneForegroundEventLEv @ 322 NONAME
-	_ZThn12_N18CPhoneUIControllerD0Ev @ 323 NONAME
-	_ZThn12_N18CPhoneUIControllerD1Ev @ 324 NONAME
-	_ZThn12_N19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 325 NONAME
-	_ZThn12_N19CPhoneStateIncoming20HandleKeyLockEnabledEi @ 326 NONAME
-	_ZThn12_N19CPhoneStateIncomingD0Ev @ 327 NONAME
-	_ZThn12_N19CPhoneStateIncomingD1Ev @ 328 NONAME
-	_ZThn12_N20CPhoneStateCallSetupD0Ev @ 329 NONAME
-	_ZThn12_N20CPhoneStateCallSetupD1Ev @ 330 NONAME
-	_ZThn16_N11CPhoneState14HandleCommandLEi @ 331 NONAME
-	_ZThn16_N11CPhoneState15ProcessCommandLEi @ 332 NONAME
-	_ZThn16_N11CPhoneStateD0Ev @ 333 NONAME
-	_ZThn16_N11CPhoneStateD1Ev @ 334 NONAME
-	_ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 335 NONAME
-	_ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 336 NONAME
-	_ZThn16_N15CPhoneStateIdleD0Ev @ 337 NONAME
-	_ZThn16_N15CPhoneStateIdleD1Ev @ 338 NONAME
-	_ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 339 NONAME
-	_ZThn16_N17CPhoneStateInCallD0Ev @ 340 NONAME
-	_ZThn16_N17CPhoneStateInCallD1Ev @ 341 NONAME
-	_ZThn16_N18CPhoneStateStartupD0Ev @ 342 NONAME
-	_ZThn16_N18CPhoneStateStartupD1Ev @ 343 NONAME
-	_ZThn16_N18CPhoneUIController14HandleCommandLEi @ 344 NONAME
-	_ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 345 NONAME
-	_ZThn16_N18CPhoneUIControllerD0Ev @ 346 NONAME
-	_ZThn16_N18CPhoneUIControllerD1Ev @ 347 NONAME
-	_ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 348 NONAME
-	_ZThn16_N19CPhoneStateIncomingD0Ev @ 349 NONAME
-	_ZThn16_N19CPhoneStateIncomingD1Ev @ 350 NONAME
-	_ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 351 NONAME
-	_ZThn16_N20CPhoneStateCallSetupD0Ev @ 352 NONAME
-	_ZThn16_N20CPhoneStateCallSetupD1Ev @ 353 NONAME
-	_ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 354 NONAME
-	_ZThn20_N11CPhoneStateD0Ev @ 355 NONAME
-	_ZThn20_N11CPhoneStateD1Ev @ 356 NONAME
-	_ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 357 NONAME
-	_ZThn20_N15CPhoneStateIdleD0Ev @ 358 NONAME
-	_ZThn20_N15CPhoneStateIdleD1Ev @ 359 NONAME
-	_ZThn20_N17CPhoneStateInCallD0Ev @ 360 NONAME
-	_ZThn20_N17CPhoneStateInCallD1Ev @ 361 NONAME
-	_ZThn20_N18CPhoneStateStartupD0Ev @ 362 NONAME
-	_ZThn20_N18CPhoneStateStartupD1Ev @ 363 NONAME
-	_ZThn20_N19CPhoneStateIncomingD0Ev @ 364 NONAME
-	_ZThn20_N19CPhoneStateIncomingD1Ev @ 365 NONAME
-	_ZThn20_N20CPhoneStateCallSetupD0Ev @ 366 NONAME
-	_ZThn20_N20CPhoneStateCallSetupD1Ev @ 367 NONAME
-	_ZThn24_N11CPhoneState19SetDivertIndicationEi @ 368 NONAME
-	_ZThn24_N11CPhoneStateD0Ev @ 369 NONAME
-	_ZThn24_N11CPhoneStateD1Ev @ 370 NONAME
-	_ZThn24_N15CPhoneStateIdleD0Ev @ 371 NONAME
-	_ZThn24_N15CPhoneStateIdleD1Ev @ 372 NONAME
-	_ZThn24_N17CPhoneStateInCallD0Ev @ 373 NONAME
-	_ZThn24_N17CPhoneStateInCallD1Ev @ 374 NONAME
-	_ZThn24_N18CPhoneStateStartupD0Ev @ 375 NONAME
-	_ZThn24_N18CPhoneStateStartupD1Ev @ 376 NONAME
-	_ZThn24_N19CPhoneStateIncomingD0Ev @ 377 NONAME
-	_ZThn24_N19CPhoneStateIncomingD1Ev @ 378 NONAME
-	_ZThn24_N20CPhoneStateCallSetupD0Ev @ 379 NONAME
-	_ZThn24_N20CPhoneStateCallSetupD1Ev @ 380 NONAME
-	_ZThn28_NK11CPhoneState17GetBlockedKeyListEv @ 381 NONAME
-	_ZThn32_N11CPhoneState25HandleNumberEntryClearedLEv @ 382 NONAME
-	_ZThn32_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 383 NONAME
-	_ZThn32_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 384 NONAME
-	_ZThn32_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 385 NONAME
-	_ZThn32_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 386 NONAME
-	_ZThn36_N11CPhoneState23HandleNumberEntryEditedEv @ 387 NONAME
-	_ZThn36_N11CPhoneStateD0Ev @ 388 NONAME
-	_ZThn36_N11CPhoneStateD1Ev @ 389 NONAME
-	_ZThn36_N15CPhoneStateIdleD0Ev @ 390 NONAME
-	_ZThn36_N15CPhoneStateIdleD1Ev @ 391 NONAME
-	_ZThn36_N17CPhoneStateInCallD0Ev @ 392 NONAME
-	_ZThn36_N17CPhoneStateInCallD1Ev @ 393 NONAME
-	_ZThn36_N18CPhoneStateStartupD0Ev @ 394 NONAME
-	_ZThn36_N18CPhoneStateStartupD1Ev @ 395 NONAME
-	_ZThn36_N19CPhoneStateIncomingD0Ev @ 396 NONAME
-	_ZThn36_N19CPhoneStateIncomingD1Ev @ 397 NONAME
-	_ZThn36_N20CPhoneStateCallSetupD0Ev @ 398 NONAME
-	_ZThn36_N20CPhoneStateCallSetupD1Ev @ 399 NONAME
-	_ZThn40_NK11CPhoneState11IsKeyLockOnEv @ 400 NONAME
-	_ZThn40_NK11CPhoneState12IsAutoLockOnEv @ 401 NONAME
-	_ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 402 NONAME
-	_ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 403 NONAME
-	_ZThn4_N11CPhoneStateD0Ev @ 404 NONAME
-	_ZThn4_N11CPhoneStateD1Ev @ 405 NONAME
-	_ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 406 NONAME
-	_ZThn4_N15CPhoneStateIdleD0Ev @ 407 NONAME
-	_ZThn4_N15CPhoneStateIdleD1Ev @ 408 NONAME
-	_ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 409 NONAME
-	_ZThn4_N17CPhoneStateInCallD0Ev @ 410 NONAME
-	_ZThn4_N17CPhoneStateInCallD1Ev @ 411 NONAME
-	_ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 412 NONAME
-	_ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 413 NONAME
-	_ZThn4_N18CPhoneStateMachine12PhoneStorageEv @ 414 NONAME
-	_ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 415 NONAME
-	_ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 416 NONAME
-	_ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 417 NONAME
-	_ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 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
-	_ZN18CPhoneStateStartup26HandlePEConstructionReadyLEi @ 471 NONAME
-	_ZN17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 472 NONAME
-	_ZThn12_N17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 473 NONAME
+	_ZN11CPhoneState14BaseConstructLEv @ 5 NONAME
+	_ZN11CPhoneState14DialVoiceCallLEv @ 6 NONAME
+	_ZN11CPhoneState14EndTransEffectEv @ 7 NONAME
+	_ZN11CPhoneState14HandleCommandLEi @ 8 NONAME
+	_ZN11CPhoneState14IsNoteVisibleLEv @ 9 NONAME
+	_ZN11CPhoneState14ShowTextQueryLEiiiP6TDes16i @ 10 NONAME
+	_ZN11CPhoneState15BeginUiUpdateLCEv @ 11 NONAME
+	_ZN11CPhoneState15DisconnectCallLEv @ 12 NONAME
+	_ZN11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 13 NONAME
+	_ZN11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 14 NONAME
+	_ZN11CPhoneState15HandleLongHashLEv @ 15 NONAME
+	_ZN11CPhoneState15ProcessCommandLEi @ 16 NONAME
+	_ZN11CPhoneState15SetContextMenuLEi @ 17 NONAME
+	_ZN11CPhoneState16CallWaitingNoteLEi @ 18 NONAME
+	_ZN11CPhoneState16CloseDTMFEditorLEv @ 19 NONAME
+	_ZN11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 20 NONAME
+	_ZN11CPhoneState16SetDefaultFlagsLEv @ 21 NONAME
+	_ZN11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 22 NONAME
+	_ZN11CPhoneState17IsAnyQueryActiveLEv @ 23 NONAME
+	_ZN11CPhoneState17SetCallHeaderTypeEN14CBubbleManager19TPhoneCallTypeFlagsE @ 24 NONAME
+	_ZN11CPhoneState17SetHandsfreeModeLEi @ 25 NONAME
+	_ZN11CPhoneState17SetToolbarDimmingEi @ 26 NONAME
+	_ZN11CPhoneState18BeginTransEffectLCE21TStateTransEffectType @ 27 NONAME
+	_ZN11CPhoneState18DisplayIdleScreenLEv @ 28 NONAME
+	_ZN11CPhoneState18GetRemoteInfoDataLEiR6TDes16 @ 29 NONAME
+	_ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 30 NONAME
+	_ZN11CPhoneState18HandleSystemEventLERK8TWsEvent @ 31 NONAME
+	_ZN11CPhoneState18IsNumberEntryUsedLEv @ 32 NONAME
+	_ZN11CPhoneState19CompleteSatRequestLEi @ 33 NONAME
+	_ZN11CPhoneState19DialMultimediaCallLEv @ 34 NONAME
+	_ZN11CPhoneState19HandleCenRepChangeLERK4TUidj @ 35 NONAME
+	_ZN11CPhoneState19HandlePhoneStartupLEv @ 36 NONAME
+	_ZN11CPhoneState19SendGlobalInfoNoteLEi @ 37 NONAME
+	_ZN11CPhoneState19SetBTHandsfreeModeLEi @ 38 NONAME
+	_ZN11CPhoneState19SetDivertIndicationEi @ 39 NONAME
+	_ZN11CPhoneState19SetTouchPaneButtonsEi @ 40 NONAME
+	_ZN11CPhoneState19SetTouchPaneVisibleEi @ 41 NONAME
+	_ZN11CPhoneState19ShowNumberBusyNoteLEv @ 42 NONAME
+	_ZN11CPhoneState20CallFromNumberEntryLEv @ 43 NONAME
+	_ZN11CPhoneState20DecreaseAudioVolumeLEv @ 44 NONAME
+	_ZN11CPhoneState20HandleDisconnectingLEi @ 45 NONAME
+	_ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 46 NONAME
+	_ZN11CPhoneState20IncreaseAudioVolumeLEv @ 47 NONAME
+	_ZN11CPhoneState20SendGlobalErrorNoteLEi @ 48 NONAME
+	_ZN11CPhoneState21IsNumberEntryVisibleLEv @ 49 NONAME
+	_ZN11CPhoneState21UpdateRemoteInfoDataLEi @ 50 NONAME
+	_ZN11CPhoneState22CloseCustomizedDialerLEv @ 51 NONAME
+	_ZN11CPhoneState22DeleteTouchPaneButtonsEv @ 52 NONAME
+	_ZN11CPhoneState22HandleForegroundEventLEi @ 53 NONAME
+	_ZN11CPhoneState22HandleNumericKeyEventLERK9TKeyEvent10TEventCode @ 54 NONAME
+	_ZN11CPhoneState22HandlePropertyChangedLERK4TUidji @ 55 NONAME
+	_ZN11CPhoneState22OnlyHashInNumberEntryLEv @ 56 NONAME
+	_ZN11CPhoneState22PhoneNumberFromEntryLCEv @ 57 NONAME
+	_ZN11CPhoneState22SendGlobalWarningNoteLEi @ 58 NONAME
+	_ZN11CPhoneState22StartShowSecurityNoteLEv @ 59 NONAME
+	_ZN11CPhoneState23HandleAudioMuteChangedLEv @ 60 NONAME
+	_ZN11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 61 NONAME
+	_ZN11CPhoneState23HandleNumberEntryEditedEv @ 62 NONAME
+	_ZN11CPhoneState23SetRingingTonePlaybackLEi @ 63 NONAME
+	_ZN11CPhoneState23UpdateSingleActiveCallLEi @ 64 NONAME
+	_ZN11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 65 NONAME
+	_ZN11CPhoneState24HandleEnvironmentChangeLEi @ 66 NONAME
+	_ZN11CPhoneState24StartAlsLineChangeTimerLEv @ 67 NONAME
+	_ZN11CPhoneState24StoreNumberEntryContentLEv @ 68 NONAME
+	_ZN11CPhoneState24UpdateInCallContextMenuLEv @ 69 NONAME
+	_ZN11CPhoneState25HandleAudioOutputChangedLEv @ 70 NONAME
+	_ZN11CPhoneState25HandleNumberEntryClearedLEv @ 71 NONAME
+	_ZN11CPhoneState25HandlePhoneEngineMessageLEii @ 72 NONAME
+	_ZN11CPhoneState25SetNumberEntryVisibilityLEi @ 73 NONAME
+	_ZN11CPhoneState25SetTouchPaneButtonEnabledEi @ 74 NONAME
+	_ZN11CPhoneState26HandleIdleForegroundEventLEv @ 75 NONAME
+	_ZN11CPhoneState26HandlePhoneFocusLostEventLEv @ 76 NONAME
+	_ZN11CPhoneState26IsNumberEntryContentStoredEv @ 77 NONAME
+	_ZN11CPhoneState26RestoreNumberEntryContentLEv @ 78 NONAME
+	_ZN11CPhoneState26SetTouchPaneButtonDisabledEi @ 79 NONAME
+	_ZN11CPhoneState26UpdateIncomingContextMenuLEi @ 80 NONAME
+	_ZN11CPhoneState26UpdateSilenceButtonDimmingEv @ 81 NONAME
+	_ZN11CPhoneState27DisplayCallTerminationNoteLEv @ 82 NONAME
+	_ZN11CPhoneState27HandlePhoneForegroundEventLEv @ 83 NONAME
+	_ZN11CPhoneState28ClearNumberEntryContentCacheEv @ 84 NONAME
+	_ZN11CPhoneState28SetupIdleScreenInBackgroundLEv @ 85 NONAME
+	_ZN11CPhoneState29DisplayHeaderForCallComingInLEii @ 86 NONAME
+	_ZN11CPhoneState29DisplayHeaderForOutgoingCallLEi @ 87 NONAME
+	_ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 88 NONAME
+	_ZN11CPhoneState30CustomizedDialerCbaResourceIdLEv @ 89 NONAME
+	_ZN11CPhoneState31CustomizedDialerMenuResourceIdLEv @ 90 NONAME
+	_ZN11CPhoneState34CaptureKeysDuringCallNotificationLEi @ 91 NONAME
+	_ZN11CPhoneState34SetCallHeaderTextsForCallComingInLEiiP28TPhoneCmdParamCallHeaderData @ 92 NONAME
+	_ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 93 NONAME
+	_ZN11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 94 NONAME
+	_ZN11CPhoneState38CheckIfRestoreNEContentAfterDtmfDialerEv @ 95 NONAME
+	_ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 96 NONAME
+	_ZN11CPhoneState7IsSimOkEv @ 97 NONAME
+	_ZN11CPhoneState9ShowNoteLEi @ 98 NONAME
+	_ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 99 NONAME
+	_ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 100 NONAME
+	_ZN11CPhoneStateD0Ev @ 101 NONAME
+	_ZN11CPhoneStateD1Ev @ 102 NONAME
+	_ZN11CPhoneStateD2Ev @ 103 NONAME
+	_ZN15CPhoneStateIdle10ConstructLEv @ 104 NONAME
+	_ZN15CPhoneStateIdle10SpeedDialLERKjNS_21TDialInitiationMethodE @ 105 NONAME
+	_ZN15CPhoneStateIdle14DialVoiceCallLEv @ 106 NONAME
+	_ZN15CPhoneStateIdle14HandleCommandLEi @ 107 NONAME
+	_ZN15CPhoneStateIdle14HandleDialingLEi @ 108 NONAME
+	_ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 109 NONAME
+	_ZN15CPhoneStateIdle15ProcessCommandLEi @ 110 NONAME
+	_ZN15CPhoneStateIdle17DisplayCallSetupLEi @ 111 NONAME
+	_ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 112 NONAME
+	_ZN15CPhoneStateIdle18HandleSendCommandLEv @ 113 NONAME
+	_ZN15CPhoneStateIdle18SpeedDialCanceledLERKj @ 114 NONAME
+	_ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 115 NONAME
+	_ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 116 NONAME
+	_ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 117 NONAME
+	_ZN15CPhoneStateIdle22OnlyHashInNumberEntryLEv @ 118 NONAME
+	_ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 119 NONAME
+	_ZN15CPhoneStateIdle25HandleNumberLongKeyPressLEv @ 120 NONAME
+	_ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 121 NONAME
+	_ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 122 NONAME
+	_ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 123 NONAME
+	_ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 124 NONAME
+	_ZN15CPhoneStateIdle5DialLERK7TDesC1616TPhoneNumberTypeNS_21TDialInitiationMethodE @ 125 NONAME
+	_ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 126 NONAME
+	_ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 127 NONAME
+	_ZN15CPhoneStateIdleD0Ev @ 128 NONAME
+	_ZN15CPhoneStateIdleD1Ev @ 129 NONAME
+	_ZN15CPhoneStateIdleD2Ev @ 130 NONAME
+	_ZN16CPhoneCbaManager10UpdateCbaLEi @ 131 NONAME
+	_ZN16CPhoneCbaManager18UpdateIncomingCbaLEi @ 132 NONAME
+	_ZN16CPhoneCbaManager7SetCbaLEi @ 133 NONAME
+	_ZN17CPhoneStateHandle17ViewCommandHandleEv @ 134 NONAME
+	_ZN17CPhoneStateHandle8InstanceEv @ 135 NONAME
+	_ZN17CPhoneStateInCall10ConstructLEv @ 136 NONAME
+	_ZN17CPhoneStateInCall10UpdateCbaLEi @ 137 NONAME
+	_ZN17CPhoneStateInCall11HandleIdleLEi @ 138 NONAME
+	_ZN17CPhoneStateInCall12OpenMenuBarLEv @ 139 NONAME
+	_ZN17CPhoneStateInCall14HandleCommandLEi @ 140 NONAME
+	_ZN17CPhoneStateInCall15CloseDtmfQueryLEv @ 141 NONAME
+	_ZN17CPhoneStateInCall15GetRingingCallLEv @ 142 NONAME
+	_ZN17CPhoneStateInCall16UpdateInCallCbaLEv @ 143 NONAME
+	_ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 144 NONAME
+	_ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 145 NONAME
+	_ZN17CPhoneStateInCall18CreateNumberEntryLEv @ 146 NONAME
+	_ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 147 NONAME
+	_ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 148 NONAME
+	_ZN17CPhoneStateInCall19LaunchNewCallQueryLEv @ 149 NONAME
+	_ZN17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 150 NONAME
+	_ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 151 NONAME
+	_ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 152 NONAME
+	_ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 153 NONAME
+	_ZN17CPhoneStateInCall34PhoneNumberAvailableInPhoneEngineLEi @ 154 NONAME
+	_ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 155 NONAME
+	_ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 156 NONAME
+	_ZN17CPhoneStateInCallD0Ev @ 157 NONAME
+	_ZN17CPhoneStateInCallD1Ev @ 158 NONAME
+	_ZN17CPhoneStateInCallD2Ev @ 159 NONAME
+	_ZN18CPhoneStateMachine11ChangeStateEi @ 160 NONAME
+	_ZN18CPhoneStateMachine11PhoneEngineEv @ 161 NONAME
+	_ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 162 NONAME
+	_ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 163 NONAME
+	_ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 164 NONAME
+	_ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 165 NONAME
+	_ZN18CPhoneStateMachine5StateEv @ 166 NONAME
+	_ZN18CPhoneStateMachine9SetCallIdEi @ 167 NONAME
+	_ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 168 NONAME
+	_ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 169 NONAME
+	_ZN18CPhoneStateMachineD0Ev @ 170 NONAME
+	_ZN18CPhoneStateMachineD1Ev @ 171 NONAME
+	_ZN18CPhoneStateMachineD2Ev @ 172 NONAME
+	_ZN18CPhoneStateStartup10ConstructLEv @ 173 NONAME
+	_ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 174 NONAME
+	_ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 175 NONAME
+	_ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 176 NONAME
+	_ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 177 NONAME
+	_ZN18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 178 NONAME
+	_ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 179 NONAME
+	_ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 180 NONAME
+	_ZN18CPhoneStateStartup26HandlePEConstructionReadyLEi @ 181 NONAME
+	_ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 182 NONAME
+	_ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 183 NONAME
+	_ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 184 NONAME
+	_ZN18CPhoneStateStartupD0Ev @ 185 NONAME
+	_ZN18CPhoneStateStartupD1Ev @ 186 NONAME
+	_ZN18CPhoneStateStartupD2Ev @ 187 NONAME
+	_ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 188 NONAME
+	_ZN18CPhoneUIController13HandleMessageEii @ 189 NONAME
+	_ZN18CPhoneUIController14HandleCommandLEi @ 190 NONAME
+	_ZN18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 191 NONAME
+	_ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 192 NONAME
+	_ZN18CPhoneUIController15ProcessCommandLEi @ 193 NONAME
+	_ZN18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 194 NONAME
+	_ZN18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 195 NONAME
+	_ZN18CPhoneUIController19HandlePhoneStartupLEv @ 196 NONAME
+	_ZN18CPhoneUIController22HandleForegroundEventLEi @ 197 NONAME
+	_ZN18CPhoneUIController24HandleEnvironmentChangeLEi @ 198 NONAME
+	_ZN18CPhoneUIController26HandleIdleForegroundEventLEv @ 199 NONAME
+	_ZN18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 200 NONAME
+	_ZN18CPhoneUIController27HandlePhoneForegroundEventLEv @ 201 NONAME
+	_ZN18CPhoneUIController4NewLEP23MPhoneViewCommandHandle @ 202 NONAME
+	_ZN18CPhoneUIControllerD0Ev @ 203 NONAME
+	_ZN18CPhoneUIControllerD1Ev @ 204 NONAME
+	_ZN18CPhoneUIControllerD2Ev @ 205 NONAME
+	_ZN19CPhoneStateIncoming10ConstructLEv @ 206 NONAME
+	_ZN19CPhoneStateIncoming14HandleCommandLEi @ 207 NONAME
+	_ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 208 NONAME
+	_ZN19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 209 NONAME
+	_ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 210 NONAME
+	_ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 211 NONAME
+	_ZN19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 212 NONAME
+	_ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 213 NONAME
+	_ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 214 NONAME
+	_ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 215 NONAME
+	_ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 216 NONAME
+	_ZN19CPhoneStateIncomingD0Ev @ 217 NONAME
+	_ZN19CPhoneStateIncomingD1Ev @ 218 NONAME
+	_ZN19CPhoneStateIncomingD2Ev @ 219 NONAME
+	_ZN20CPhoneReconnectQuery19ShowReconnectQueryLEi @ 220 NONAME
+	_ZN20CPhoneReconnectQuery9InstanceLEv @ 221 NONAME
+	_ZN20CPhoneStateCallSetup10ConstructLEv @ 222 NONAME
+	_ZN20CPhoneStateCallSetup10UpdateCbaLEi @ 223 NONAME
+	_ZN20CPhoneStateCallSetup12OpenMenuBarLEv @ 224 NONAME
+	_ZN20CPhoneStateCallSetup14HandleCommandLEi @ 225 NONAME
+	_ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 226 NONAME
+	_ZN20CPhoneStateCallSetup16UpdateInCallCbaLEv @ 227 NONAME
+	_ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 228 NONAME
+	_ZN20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 229 NONAME
+	_ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 230 NONAME
+	_ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 231 NONAME
+	_ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 232 NONAME
+	_ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 233 NONAME
+	_ZN20CPhoneStateCallSetupD0Ev @ 234 NONAME
+	_ZN20CPhoneStateCallSetupD1Ev @ 235 NONAME
+	_ZN20CPhoneStateCallSetupD2Ev @ 236 NONAME
+	_ZNK11CPhoneState11IsKeyLockOnEv @ 237 NONAME
+	_ZNK11CPhoneState12IsAutoLockOnEv @ 238 NONAME
+	_ZNK11CPhoneState14IsSwivelClosedEv @ 239 NONAME
+	_ZNK11CPhoneState17IsMenuBarVisibleLEv @ 240 NONAME
+	_ZNK11CPhoneState18TopAppIsDisplayedLEv @ 241 NONAME
+	_ZNK11CPhoneState20IsDTMFEditorVisibleLEv @ 242 NONAME
+	_ZNK11CPhoneState25IsOnScreenDialerSupportedEv @ 243 NONAME
+	_ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 244 NONAME
+	_ZNK11CPhoneState26IsDialingExtensionInFocusLEv @ 245 NONAME
+	_ZNK11CPhoneState28NeedToReturnToForegroundAppLEv @ 246 NONAME
+	_ZNK11CPhoneState8SimStateEv @ 247 NONAME
+	_ZNK15CPhoneStateIdle17IsSpeedDialNumberERK7TDesC16 @ 248 NONAME
+	_ZTI11CPhoneState @ 249 NONAME
+	_ZTI15CPhoneStateIdle @ 250 NONAME
+	_ZTI17CPhoneStateHandle @ 251 NONAME
+	_ZTI17CPhoneStateInCall @ 252 NONAME
+	_ZTI18CPhoneStateMachine @ 253 NONAME
+	_ZTI18CPhoneStateStartup @ 254 NONAME
+	_ZTI18CPhoneUIController @ 255 NONAME
+	_ZTI19CPhoneStateIncoming @ 256 NONAME
+	_ZTI20CPhoneReconnectQuery @ 257 NONAME
+	_ZTI20CPhoneStateCallSetup @ 258 NONAME
+	_ZTI23CPhoneDtmfWaitCharTimer @ 259 NONAME
+	_ZTI23CPhoneKeyEventForwarder @ 260 NONAME
+	_ZTI24CPhoneSystemEventHandler @ 261 NONAME
+	_ZTI26CPhoneRemoteControlHandler @ 262 NONAME
+	_ZTI27CPhoneBtaaDisconnectHandler @ 263 NONAME
+	_ZTV11CPhoneState @ 264 NONAME
+	_ZTV15CPhoneStateIdle @ 265 NONAME
+	_ZTV17CPhoneStateHandle @ 266 NONAME
+	_ZTV17CPhoneStateInCall @ 267 NONAME
+	_ZTV18CPhoneStateMachine @ 268 NONAME
+	_ZTV18CPhoneStateStartup @ 269 NONAME
+	_ZTV18CPhoneUIController @ 270 NONAME
+	_ZTV19CPhoneStateIncoming @ 271 NONAME
+	_ZTV20CPhoneReconnectQuery @ 272 NONAME
+	_ZTV20CPhoneStateCallSetup @ 273 NONAME
+	_ZTV23CPhoneDtmfWaitCharTimer @ 274 NONAME
+	_ZTV23CPhoneKeyEventForwarder @ 275 NONAME
+	_ZTV24CPhoneSystemEventHandler @ 276 NONAME
+	_ZTV26CPhoneRemoteControlHandler @ 277 NONAME
+	_ZTV27CPhoneBtaaDisconnectHandler @ 278 NONAME
+	_ZThn12_N11CPhoneState15DynInitMenuBarLEiP11CEikMenuBar @ 279 NONAME
+	_ZThn12_N11CPhoneState16DynInitMenuPaneLEiP12CEikMenuPane @ 280 NONAME
+	_ZThn12_N11CPhoneState18HandleSystemEventLERK8TWsEvent @ 281 NONAME
+	_ZThn12_N11CPhoneState19HandleCenRepChangeLERK4TUidj @ 282 NONAME
+	_ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 283 NONAME
+	_ZThn12_N11CPhoneState22HandleForegroundEventLEi @ 284 NONAME
+	_ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 285 NONAME
+	_ZThn12_N11CPhoneState24HandleEnvironmentChangeLEi @ 286 NONAME
+	_ZThn12_N11CPhoneState26HandleIdleForegroundEventLEv @ 287 NONAME
+	_ZThn12_N11CPhoneState26HandlePhoneFocusLostEventLEv @ 288 NONAME
+	_ZThn12_N11CPhoneState27HandlePhoneForegroundEventLEv @ 289 NONAME
+	_ZThn12_N11CPhoneStateD0Ev @ 290 NONAME
+	_ZThn12_N11CPhoneStateD1Ev @ 291 NONAME
+	_ZThn12_N15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 292 NONAME
+	_ZThn12_N15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 293 NONAME
+	_ZThn12_N15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 294 NONAME
+	_ZThn12_N15CPhoneStateIdleD0Ev @ 295 NONAME
+	_ZThn12_N15CPhoneStateIdleD1Ev @ 296 NONAME
+	_ZThn12_N17CPhoneStateInCall22HandlePropertyChangedLERK4TUidji @ 297 NONAME
+	_ZThn12_N17CPhoneStateInCallD0Ev @ 298 NONAME
+	_ZThn12_N17CPhoneStateInCallD1Ev @ 299 NONAME
+	_ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 300 NONAME
+	_ZThn12_N18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 301 NONAME
+	_ZThn12_N18CPhoneStateStartupD0Ev @ 302 NONAME
+	_ZThn12_N18CPhoneStateStartupD1Ev @ 303 NONAME
+	_ZThn12_N18CPhoneUIController15DynInitMenuBarLEiP11CEikMenuBar @ 304 NONAME
+	_ZThn12_N18CPhoneUIController16DynInitMenuPaneLEiP12CEikMenuPane @ 305 NONAME
+	_ZThn12_N18CPhoneUIController18HandleSystemEventLERK8TWsEvent @ 306 NONAME
+	_ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 307 NONAME
+	_ZThn12_N18CPhoneUIController22HandleForegroundEventLEi @ 308 NONAME
+	_ZThn12_N18CPhoneUIController24HandleEnvironmentChangeLEi @ 309 NONAME
+	_ZThn12_N18CPhoneUIController26HandleIdleForegroundEventLEv @ 310 NONAME
+	_ZThn12_N18CPhoneUIController26HandlePhoneFocusLostEventLEv @ 311 NONAME
+	_ZThn12_N18CPhoneUIController27HandlePhoneForegroundEventLEv @ 312 NONAME
+	_ZThn12_N18CPhoneUIControllerD0Ev @ 313 NONAME
+	_ZThn12_N18CPhoneUIControllerD1Ev @ 314 NONAME
+	_ZThn12_N19CPhoneStateIncoming16DynInitMenuPaneLEiP12CEikMenuPane @ 315 NONAME
+	_ZThn12_N19CPhoneStateIncomingD0Ev @ 316 NONAME
+	_ZThn12_N19CPhoneStateIncomingD1Ev @ 317 NONAME
+	_ZThn12_N20CPhoneStateCallSetupD0Ev @ 318 NONAME
+	_ZThn12_N20CPhoneStateCallSetupD1Ev @ 319 NONAME
+	_ZThn16_N11CPhoneState14HandleCommandLEi @ 320 NONAME
+	_ZThn16_N11CPhoneState15ProcessCommandLEi @ 321 NONAME
+	_ZThn16_N11CPhoneStateD0Ev @ 322 NONAME
+	_ZThn16_N11CPhoneStateD1Ev @ 323 NONAME
+	_ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 324 NONAME
+	_ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 325 NONAME
+	_ZThn16_N15CPhoneStateIdleD0Ev @ 326 NONAME
+	_ZThn16_N15CPhoneStateIdleD1Ev @ 327 NONAME
+	_ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 328 NONAME
+	_ZThn16_N17CPhoneStateInCallD0Ev @ 329 NONAME
+	_ZThn16_N17CPhoneStateInCallD1Ev @ 330 NONAME
+	_ZThn16_N18CPhoneStateStartupD0Ev @ 331 NONAME
+	_ZThn16_N18CPhoneStateStartupD1Ev @ 332 NONAME
+	_ZThn16_N18CPhoneUIController14HandleCommandLEi @ 333 NONAME
+	_ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 334 NONAME
+	_ZThn16_N18CPhoneUIControllerD0Ev @ 335 NONAME
+	_ZThn16_N18CPhoneUIControllerD1Ev @ 336 NONAME
+	_ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 337 NONAME
+	_ZThn16_N19CPhoneStateIncomingD0Ev @ 338 NONAME
+	_ZThn16_N19CPhoneStateIncomingD1Ev @ 339 NONAME
+	_ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 340 NONAME
+	_ZThn16_N20CPhoneStateCallSetupD0Ev @ 341 NONAME
+	_ZThn16_N20CPhoneStateCallSetupD1Ev @ 342 NONAME
+	_ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 343 NONAME
+	_ZThn20_N11CPhoneStateD0Ev @ 344 NONAME
+	_ZThn20_N11CPhoneStateD1Ev @ 345 NONAME
+	_ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 346 NONAME
+	_ZThn20_N15CPhoneStateIdleD0Ev @ 347 NONAME
+	_ZThn20_N15CPhoneStateIdleD1Ev @ 348 NONAME
+	_ZThn20_N17CPhoneStateInCallD0Ev @ 349 NONAME
+	_ZThn20_N17CPhoneStateInCallD1Ev @ 350 NONAME
+	_ZThn20_N18CPhoneStateStartupD0Ev @ 351 NONAME
+	_ZThn20_N18CPhoneStateStartupD1Ev @ 352 NONAME
+	_ZThn20_N19CPhoneStateIncomingD0Ev @ 353 NONAME
+	_ZThn20_N19CPhoneStateIncomingD1Ev @ 354 NONAME
+	_ZThn20_N20CPhoneStateCallSetupD0Ev @ 355 NONAME
+	_ZThn20_N20CPhoneStateCallSetupD1Ev @ 356 NONAME
+	_ZThn24_N11CPhoneState19SetDivertIndicationEi @ 357 NONAME
+	_ZThn24_N11CPhoneStateD0Ev @ 358 NONAME
+	_ZThn24_N11CPhoneStateD1Ev @ 359 NONAME
+	_ZThn24_N15CPhoneStateIdleD0Ev @ 360 NONAME
+	_ZThn24_N15CPhoneStateIdleD1Ev @ 361 NONAME
+	_ZThn24_N17CPhoneStateInCallD0Ev @ 362 NONAME
+	_ZThn24_N17CPhoneStateInCallD1Ev @ 363 NONAME
+	_ZThn24_N18CPhoneStateStartupD0Ev @ 364 NONAME
+	_ZThn24_N18CPhoneStateStartupD1Ev @ 365 NONAME
+	_ZThn24_N19CPhoneStateIncomingD0Ev @ 366 NONAME
+	_ZThn24_N19CPhoneStateIncomingD1Ev @ 367 NONAME
+	_ZThn24_N20CPhoneStateCallSetupD0Ev @ 368 NONAME
+	_ZThn24_N20CPhoneStateCallSetupD1Ev @ 369 NONAME
+	_ZThn28_N11CPhoneState25HandleNumberEntryClearedLEv @ 370 NONAME
+	_ZThn28_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 371 NONAME
+	_ZThn28_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 372 NONAME
+	_ZThn28_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 373 NONAME
+	_ZThn28_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 374 NONAME
+	_ZThn32_N11CPhoneState23HandleNumberEntryEditedEv @ 375 NONAME
+	_ZThn32_N11CPhoneStateD0Ev @ 376 NONAME
+	_ZThn32_N11CPhoneStateD1Ev @ 377 NONAME
+	_ZThn32_N15CPhoneStateIdleD0Ev @ 378 NONAME
+	_ZThn32_N15CPhoneStateIdleD1Ev @ 379 NONAME
+	_ZThn32_N17CPhoneStateInCallD0Ev @ 380 NONAME
+	_ZThn32_N17CPhoneStateInCallD1Ev @ 381 NONAME
+	_ZThn32_N18CPhoneStateStartupD0Ev @ 382 NONAME
+	_ZThn32_N18CPhoneStateStartupD1Ev @ 383 NONAME
+	_ZThn32_N19CPhoneStateIncomingD0Ev @ 384 NONAME
+	_ZThn32_N19CPhoneStateIncomingD1Ev @ 385 NONAME
+	_ZThn32_N20CPhoneStateCallSetupD0Ev @ 386 NONAME
+	_ZThn32_N20CPhoneStateCallSetupD1Ev @ 387 NONAME
+	_ZThn36_NK11CPhoneState11IsKeyLockOnEv @ 388 NONAME
+	_ZThn36_NK11CPhoneState12IsAutoLockOnEv @ 389 NONAME
+	_ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 390 NONAME
+	_ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 391 NONAME
+	_ZThn4_N11CPhoneStateD0Ev @ 392 NONAME
+	_ZThn4_N11CPhoneStateD1Ev @ 393 NONAME
+	_ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 394 NONAME
+	_ZThn4_N15CPhoneStateIdleD0Ev @ 395 NONAME
+	_ZThn4_N15CPhoneStateIdleD1Ev @ 396 NONAME
+	_ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 397 NONAME
+	_ZThn4_N17CPhoneStateInCallD0Ev @ 398 NONAME
+	_ZThn4_N17CPhoneStateInCallD1Ev @ 399 NONAME
+	_ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 400 NONAME
+	_ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 401 NONAME
+	_ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 402 NONAME
+	_ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 403 NONAME
+	_ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 404 NONAME
+	_ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 405 NONAME
+	_ZThn4_N18CPhoneStateMachine5StateEv @ 406 NONAME
+	_ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 407 NONAME
+	_ZThn4_N18CPhoneStateMachineD0Ev @ 408 NONAME
+	_ZThn4_N18CPhoneStateMachineD1Ev @ 409 NONAME
+	_ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 410 NONAME
+	_ZThn4_N18CPhoneStateStartupD0Ev @ 411 NONAME
+	_ZThn4_N18CPhoneStateStartupD1Ev @ 412 NONAME
+	_ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 413 NONAME
+	_ZThn4_N18CPhoneUIController13HandleMessageEii @ 414 NONAME
+	_ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 415 NONAME
+	_ZThn4_N19CPhoneStateIncomingD0Ev @ 416 NONAME
+	_ZThn4_N19CPhoneStateIncomingD1Ev @ 417 NONAME
+	_ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 418 NONAME
+	_ZThn4_N20CPhoneStateCallSetupD0Ev @ 419 NONAME
+	_ZThn4_N20CPhoneStateCallSetupD1Ev @ 420 NONAME
+	_ZThn8_N11CPhoneState14IsNoteVisibleLEv @ 421 NONAME
+	_ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 422 NONAME
+	_ZThn8_N11CPhoneState15HandleLongHashLEv @ 423 NONAME
+	_ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 424 NONAME
+	_ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 425 NONAME
+	_ZThn8_N11CPhoneState23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 426 NONAME
+	_ZThn8_N11CPhoneState24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 427 NONAME
+	_ZThn8_N11CPhoneState35IsAlphanumericSupportedAndCharInputERK9TKeyEvent @ 428 NONAME
+	_ZThn8_N11CPhoneStateD0Ev @ 429 NONAME
+	_ZThn8_N11CPhoneStateD1Ev @ 430 NONAME
+	_ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 431 NONAME
+	_ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 432 NONAME
+	_ZThn8_N15CPhoneStateIdleD0Ev @ 433 NONAME
+	_ZThn8_N15CPhoneStateIdleD1Ev @ 434 NONAME
+	_ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 435 NONAME
+	_ZThn8_N17CPhoneStateInCallD0Ev @ 436 NONAME
+	_ZThn8_N17CPhoneStateInCallD1Ev @ 437 NONAME
+	_ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 438 NONAME
+	_ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 439 NONAME
+	_ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 440 NONAME
+	_ZThn8_N18CPhoneStateStartup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 441 NONAME
+	_ZThn8_N18CPhoneStateStartupD0Ev @ 442 NONAME
+	_ZThn8_N18CPhoneStateStartupD1Ev @ 443 NONAME
+	_ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 444 NONAME
+	_ZThn8_N18CPhoneUIControllerD0Ev @ 445 NONAME
+	_ZThn8_N18CPhoneUIControllerD1Ev @ 446 NONAME
+	_ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 447 NONAME
+	_ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 448 NONAME
+	_ZThn8_N19CPhoneStateIncoming23HandleKeyPressDurationLE8TKeyCode25TTimeIntervalMicroSeconds @ 449 NONAME
+	_ZThn8_N19CPhoneStateIncomingD0Ev @ 450 NONAME
+	_ZThn8_N19CPhoneStateIncomingD1Ev @ 451 NONAME
+	_ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 452 NONAME
+	_ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 453 NONAME
+	_ZThn8_N20CPhoneStateCallSetup24HandleCreateNumberEntryLERK9TKeyEvent10TEventCode @ 454 NONAME
+	_ZThn8_N20CPhoneStateCallSetupD0Ev @ 455 NONAME
+	_ZThn8_N20CPhoneStateCallSetupD1Ev @ 456 NONAME
+	_ZThn8_NK11CPhoneState17IsMenuBarVisibleLEv @ 457 NONAME
 
--- a/phoneapp/phoneuicontrol/inc/cphonestate.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/cphonestate.h	Mon Mar 15 12:40:24 2010 +0200
@@ -170,11 +170,6 @@
         IMPORT_C virtual void HandleIdleForegroundEventL();
 
         /**
-        * Indicates when the keylock events
-        */
-        IMPORT_C virtual void HandleKeyLockEnabled( TBool aKeylockEnabled );
-        
-        /**
         * Handle environment changes.
         * @param aChanges environment changes which may be reported by
         *  a change notifier through the RChangeNotifier interface.
@@ -288,42 +283,6 @@
         IMPORT_C void SendGlobalErrorNoteL( TInt aResourceId );
 
         /**
-         * Get blocked key list
-         * @returns RArray<TInt>& lsit of blocked keys 
-         */
-        IMPORT_C const RArray<TInt>& GetBlockedKeyList() const;
-
-        /**
-         * Disable HW Keys if needed
-         */
-        IMPORT_C void DisableHWKeysL();
-
-        /**
-         * Disable Call UI
-         */
-        IMPORT_C void DisableCallUIL();
-
-        /**
-         * Enable Call UI
-         */
-        IMPORT_C void EnableCallUIL();
-
-        /**
-         * Disable HW Keys and Call UI if needed
-         */
-        IMPORT_C void CheckDisableHWKeysAndCallUIL();
-
-        /**
-         * Handle hold switch key event when there is an incoming or waiting call
-         */
-        IMPORT_C void HandleHoldSwitchL();
-        
-        /**
-         * Enable HW Keys and Call UI if needed
-         */
-        IMPORT_C void CheckEnableHWKeysAndCallUIL();
-        
-        /**
         * Fetches autolock information - is it set on or not
         * @return is autolock set on (ETrue) or off (EFalse)
         */
@@ -367,8 +326,6 @@
         */
         TBool IsNoteDismissableL();
 
-        IMPORT_C void RetainPreviousKeylockStateL();
-        
         /**
         * Check if possible dialer extension is in focus
         * @return boolean value indicating if dialer extension is in focus
--- a/phoneapp/phoneuicontrol/inc/cphonestateincoming.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/cphonestateincoming.h	Mon Mar 15 12:40:24 2010 +0200
@@ -78,11 +78,6 @@
         */ 
         IMPORT_C void HandleNumberEntryClearedL();
 
-        /** 
-        * Handle keylock state change events
-        */ 
-        IMPORT_C void HandleKeyLockEnabled( TBool aKeylockEnabled );
-        
     protected:
 
         /**
--- a/phoneapp/phoneuicontrol/inc/cphonestatemachine.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/cphonestatemachine.h	Mon Mar 15 12:40:24 2010 +0200
@@ -30,7 +30,6 @@
 
 // FORWARD DECLARATIONS
 class MPhoneState;
-class MPhoneStorage;
 
 // CLASS DECLARATION
 
@@ -101,13 +100,6 @@
         */    
         IMPORT_C void SetCallId( const TInt aCallId );
 
-       
-        /**
-        * Instantiates phone storage.
-        * @return storage instance    
-        */    
-        IMPORT_C MPhoneStorage* PhoneStorage();        
-
     protected:
 
         /**
@@ -145,9 +137,6 @@
 
         // Idle state which is hold in memory all the time
         MPhoneState* iIdleState;
-
-        // Phone's storage
-        MPhoneStorage* iPhoneStorage;
     };
 
 #endif      // CPHONESTATEMACHINE_H
--- a/phoneapp/phoneuicontrol/inc/cphonestatestartup.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/cphonestatestartup.h	Mon Mar 15 12:40:24 2010 +0200
@@ -122,6 +122,11 @@
         * if necessary.
         */
         void CreateAndShowNoteAfterIdle();
+        
+        /**
+        * Finishes phone application initialization
+        */        
+        void InitializationReadyL();
 
 
     protected: // Data
--- a/phoneapp/phoneuicontrol/inc/cphonesystemeventhandler.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/cphonesystemeventhandler.h	Mon Mar 15 12:40:24 2010 +0200
@@ -75,8 +75,6 @@
         
         void HandlePhoneFocusLostEventL();
 
-        void HandleKeyLockEnabled( TBool aKeylockEnabled );
-        
     public: // From MPhonePubSubObserver
 
         /**
--- a/phoneapp/phoneuicontrol/inc/cphoneuicontroller.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/cphoneuicontroller.h	Mon Mar 15 12:40:24 2010 +0200
@@ -158,12 +158,6 @@
         */
         IMPORT_C TBool ProcessCommandL( TInt aCommand );
 
-        /**
-        * Handles keylock events
-        * @param aCommand It is the code of the command to be handled.
-        */
-        IMPORT_C void HandleKeyLockEnabled( TBool aKeylockEnabled );
-        
         
     private:
         
--- a/phoneapp/phoneuicontrol/inc/mphonestate.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/mphonestate.h	Mon Mar 15 12:40:24 2010 +0200
@@ -30,7 +30,6 @@
 #include "mphoneneclearedhandler.h"
 #include "mphonenumberentryevents.h"
 #include "mphonelockinfo.h"
-#include "mphoneblockedkeys.h"
 
 // FORWARD DECLARATIONS
 
@@ -47,7 +46,6 @@
     public MPhoneMenuAndCbaEvents,
     public MPhoneRemoteControlEvents,
     public MPhoneDivertIF,
-    public MPhoneBlockedKeys,
     public MPhoneNEClearedHandler,
     public MPhoneNumberEntryEvents,
     public MPhoneLockInfo
--- a/phoneapp/phoneuicontrol/inc/mphonestatemachine.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/mphonestatemachine.h	Mon Mar 15 12:40:24 2010 +0200
@@ -30,7 +30,6 @@
 class MPEPhoneModel;
 class MPEEngineInfo;
 class CSpdiaControl;
-class MPhoneStorage;
 
 /**
 *  Describes the interface for setting and getting active state
@@ -87,11 +86,6 @@
         */    
         virtual void SetCallId( TInt aCallId ) = 0;
         
-        /**
-        * Phone's Storage
-        */
-        virtual MPhoneStorage* PhoneStorage() = 0;        
-
     };
 
 #endif // MPHONESTATEMACHINE_H
--- a/phoneapp/phoneuicontrol/inc/mphonesystemeventhandler.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/mphonesystemeventhandler.h	Mon Mar 15 12:40:24 2010 +0200
@@ -95,11 +95,6 @@
         */
         virtual void HandlePhoneStartupL() = 0;
 
-        /**
-        * Indicates when the keylock events
-        */
-        virtual void HandleKeyLockEnabled( TBool aKeylockEnabled ) = 0;
-        
     };
 
 #endif      // __MPHONESYSTEMEVENTHANDLER_H   
--- a/phoneapp/phoneuicontrol/inc/mphonesystemevents.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/inc/mphonesystemevents.h	Mon Mar 15 12:40:24 2010 +0200
@@ -85,11 +85,6 @@
         virtual void HandleIdleForegroundEventL() = 0;
 
         /**
-        * Indicates when the keylock events
-        */
-        virtual void HandleKeyLockEnabled( TBool aKeylockEnabled ) = 0;
-        
-        /**
         * Handle environment changes.
         * @param aChanges environment changes which may be reported by
         *  a change notifier through the RChangeNotifier interface.
--- a/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -272,30 +272,27 @@
         "CPhoneKeyEventForwarder::OfferKeyEventBeforeControlStackL");
 
     TKeyResponse response( EKeyWasNotConsumed );
-    if( !IsKeyBlocked( aKeyEvent ) )
+
+    // Handle key events before FEP
+    // This is must becouse FEP consumes * key and when
+    // editor is in alphanumeric mode FEP consumes all alphanumeric
+    // keys
+    switch( aType )
         {
-        // Handle key events before FEP
-        // This is must becouse FEP consumes * key and when
-        // editor is in alphanumeric mode FEP consumes all alphanumeric
-        // keys
-        switch( aType )
-            {
-             // EEventKeyDown
-            case EEventKeyDown:
-                response = HandleEventKeyDownBeforeControlStackL( aKeyEvent );
-                break;
-            // EEventKey
-            case EEventKey:
-                response = HandleEventKeyBeforeControlStackL( aKeyEvent );
-                break;
-            // EEventKeyUp
-            case EEventKeyUp:
-                response = HandleEventKeyUpBeforeControlStackL( aKeyEvent );
-                break;
-            default:
-                break;
-            }
-
+         // EEventKeyDown
+        case EEventKeyDown:
+            response = HandleEventKeyDownBeforeControlStackL( aKeyEvent );
+            break;
+        // EEventKey
+        case EEventKey:
+            response = HandleEventKeyBeforeControlStackL( aKeyEvent );
+            break;
+        // EEventKeyUp
+        case EEventKeyUp:
+            response = HandleEventKeyUpBeforeControlStackL( aKeyEvent );
+            break;
+        default:
+            break;
         }
     return response;
     }
@@ -313,23 +310,20 @@
     __LOGMETHODSTARTEND( EPhoneControl,
         "CPhoneKeyEventForwarder::OfferKeyEventAfterControlStackL");
     
-	if( !IsKeyBlocked( aKeyEvent ) )
+    // Send key to editor
+    iStateMachine->State()->HandleKeyEventL( aKeyEvent, aType );
+    
+    if( EEventKeyUp == aType 
+            && EKeyNull != iKeyPressedDown )
         {
-        // Send key to editor
-        iStateMachine->State()->HandleKeyEventL( aKeyEvent, aType );
-        
-        if( EEventKeyUp == aType 
-                && EKeyNull != iKeyPressedDown )
-            {
-            // Handle short key press
-            iStateMachine->State()->HandleKeyMessageL( 
-                MPhoneKeyEvents::EPhoneKeyShortPress, 
-                TKeyCode( iKeyPressedDown ) );
+        // Handle short key press
+        iStateMachine->State()->HandleKeyMessageL( 
+            MPhoneKeyEvents::EPhoneKeyShortPress, 
+            TKeyCode( iKeyPressedDown ) );
 
-            // Reset key code
-            iScanCode = EStdKeyNull;
-            iKeyPressedDown = EKeyNull;
-            }
+        // Reset key code
+        iScanCode = EStdKeyNull;
+        iKeyPressedDown = EKeyNull;
         }
 
     return EKeyWasNotConsumed;
@@ -547,32 +541,5 @@
         "CPhoneKeyEventHandler::ConvertKeyCode aCode (%d)", aCode );
     }
 
-// -----------------------------------------------------------------------------
-// CPhoneKeyEventForwarder::IsKeyBlocked
-// -----------------------------------------------------------------------------
-//
-TBool CPhoneKeyEventForwarder::IsKeyBlocked( const TKeyEvent& aKeyEvent ) const
-    {
-    TBool ret = EFalse;
-    
-    // Check blocked keys
-    const RArray<TInt>& keyScanCodeList = iStateMachine->State()->GetBlockedKeyList();
-    TInt count = keyScanCodeList.Count();
-    if( count )
-        {
-        for( TInt i = 0; i < count; i++ )
-            {
-            if( keyScanCodeList[i] == aKeyEvent.iScanCode )
-                {
-                ret = ETrue;
-                }
-            }
-        }
-    __PHONELOG1( EBasic, EPhoneControl,
-        "CPhoneKeyEventHandler::IsKeyBlocked return (%d)", ret );
-    
-    return ret;
-    }
-
 //  End of File
 
--- a/phoneapp/phoneuicontrol/src/cphonestate.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestate.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -104,7 +104,6 @@
 #include "cphonecontinueemergencycallcommand.h"
 #include "cphonecallheadermanager.h"
 #include "cphonenumberentrymanager.h"
-#include "mphonestorage.h"
 #include "easydialingcommands.hrh"
 
 
@@ -4097,13 +4096,6 @@
                     KPSUidScreenSaver,
                     KScreenSaverAllowScreenSaver,
                     EPhoneScreensaverAllowed );
-
-    // Restore keylock if phone has been locked before call.
-    if ( iStateMachine->PhoneStorage()->NeedToEnableKeylock() )
-        {
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewEnableKeyLock );
-        iStateMachine->PhoneStorage()->SetNeedToEnableKeylock( EFalse );
-        }
     }
 
 // -----------------------------------------------------------
@@ -4744,207 +4736,6 @@
             }
         }
     }
-
-// -----------------------------------------------------------
-// CPhoneState::GetBlockedKeyList
-// -----------------------------------------------------------
-//
-EXPORT_C const RArray<TInt>& CPhoneState::GetBlockedKeyList() const
-    {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::GetBlockedKeyList( ) ");
-    return iStateMachine->PhoneStorage()->GetBlockedKeyList();
-    }
-
-// -----------------------------------------------------------
-// CPhoneState::DisableHWKeysL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::DisableHWKeysL()
-    {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::DisableHWKeysL( ) ");
-
-    if( iStateMachine->PhoneStorage()->IsBlockedKeysListEmpty() )
-        {
-        __PHONELOG( EBasic, EPhoneControl, " CPhoneState::DisableHWKeysL HW Keys Disabled " );
-
-        iStateMachine->PhoneStorage()->AppendBlockedKeysListL( EStdKeyNo );
-        iStateMachine->PhoneStorage()->AppendBlockedKeysListL( EStdKeyYes );
-        }
-    }
-
-// -----------------------------------------------------------
-// CPhoneState::DisableCallUIL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::DisableCallUIL()
-    {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::DisableCallUIL( ) ");
-
-    // Set Call UI state to storage
-    if( !iStateMachine->PhoneStorage()->IsScreenLocked() )
-        {
-        __PHONELOG( EBasic, EPhoneControl, " CPhoneState::DisableCallUIL CallUI Disabled " );
-
-        // Show keys locked note
-        TPhoneCmdParamNote noteParam;
-        noteParam.SetType( EPhoneNoteUIDisabled );
-        noteParam.SetResourceId( CPhoneMainResourceResolver::Instance()->
-            ResolveResourceID( EPhoneInformationNote ) );
-    
-        HBufC* noteText = StringLoader::LoadLC( 
-            CPhoneMainResourceResolver::Instance()->
-                ResolveResourceID( EPhoneIncomingCallKeysLocked ) );
-        noteParam.SetText( *noteText );
-    
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNote, &noteParam );
-        CleanupStack::PopAndDestroy( noteText );
-    
-        // Start capturing the key guard key
-        TPhoneCmdParamKeyCapture appKeyCaptureParam;
-        appKeyCaptureParam.SetKey( EStdKeyDevice7 );
-        appKeyCaptureParam.SetKeyCode( EKeyDeviceF );
-        appKeyCaptureParam.SetCaptureType( EPhoneKeyAllEvents );
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewStartCapturingKey, &appKeyCaptureParam );
-        
-        // Set Call UI state to storage
-        iStateMachine->PhoneStorage()->SetScreenLocked( ETrue );
-        }
-    }
-
-// -----------------------------------------------------------
-// CPhoneState::EnableCallUIL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::EnableCallUIL()
-    {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::EnableCallUIL( ) ");
-
-    if( iStateMachine->PhoneStorage()->IsScreenLocked() )
-        {
-        __PHONELOG( EBasic, EPhoneControl, " CPhoneState::EnableCallUIL CallUI Enabled " );
-
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewDisableKeyLockWithoutNote );
-
-        // Stop capturing the key guard key
-        TPhoneCmdParamKeyCapture appKeyCaptureParam;
-        appKeyCaptureParam.SetKey( EStdKeyDevice7 );
-        appKeyCaptureParam.SetKeyCode( EKeyDeviceF );
-        appKeyCaptureParam.SetCaptureType( EPhoneKeyAllEvents );
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewStopCapturingKey, &appKeyCaptureParam );
-        
-        iStateMachine->PhoneStorage()->SetScreenLocked( EFalse );
-        }
-    }
-
-// -----------------------------------------------------------
-// CPhoneState::CheckDisableHWKeysAndCallUIL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::CheckDisableHWKeysAndCallUIL()
-    {
-    __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneState::CheckDisableHWKeysAndCallUIL( ) ");
-
-    if( IsKeyLockOn() || IsAutoLockOn() )
-        {
-        // Disable HW keys if needed
-        if( CPhoneCenRepProxy::Instance()->
-                IsTelephonyFeatureSupported( KTelephonyLVFlagDisableCallControlHardKeysWhileLocked ) )
-            {
-            DisableHWKeysL();
-            }
-
-        // Disable Call UI if needed
-        if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
-                && !CPhoneCenRepProxy::Instance()->
-                IsTelephonyFeatureSupported( KTelephonyLVFlagAllowUnlockOnIncoming ) )
-            {
-            DisableCallUIL();
-            iStateMachine->PhoneStorage()->SetNeedToEnableKeylock( ETrue );
-            }
-        }
-    }
-
-// -----------------------------------------------------------
-// CPhoneState::HandleHoldSwitchL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::HandleHoldSwitchL()
-    {
-    __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneState::HandleHoldSwitchL( ) ");
-
-    if( CPhoneCenRepProxy::Instance()->
-            IsTelephonyFeatureSupported( KTelephonyLVFlagDisableCallControlHardKeysWhileLocked ) )
-        {
-        if( iStateMachine->PhoneStorage()->IsBlockedKeysListEmpty() )
-            {
-            // Disable HW Keys if needed
-            DisableHWKeysL();
-            }
-        else
-            {
-            // Reset blocked keys list
-            iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-            }
-        }
-    
-    if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
-            && !CPhoneCenRepProxy::Instance()->
-            IsTelephonyFeatureSupported( KTelephonyLVFlagAllowUnlockOnIncoming ) )
-        {
-        if( iStateMachine->PhoneStorage()->IsScreenLocked() )
-            {
-            // Enable Call
-            EnableCallUIL();
-            }
-        else
-            {
-            // Set keylock enabled
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewEnableKeyLockWithoutNote );
-            // Disable Call
-            DisableCallUIL();
-            }
-        }
-        
-        // Stop ringingtone
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
-    }
-
-// -----------------------------------------------------------
-// CPhoneState::RetainPreviousKeylockStateL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::RetainPreviousKeylockStateL()
-    {
-    // Lock keypad, if keylock was enabled before incoming call.
-    // Also reset PhoneStorage keylock status.
-    if ( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) &&
-        iStateMachine->PhoneStorage()->NeedToEnableKeylock() )
-        {
-        iStateMachine->PhoneStorage()->SetNeedToEnableKeylock( EFalse );
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewEnableKeyLockWithoutNote ); 
-        }
-    }
-
-// ---------------------------------------------------------
-// CPhoneState::HandleKeyLockEnabledL
-// ---------------------------------------------------------
-//
-EXPORT_C void CPhoneState::HandleKeyLockEnabled( TBool aKeylockEnabled )
-    {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::HandleKeyLockEnabledL( ) ");
-    if( !FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
-		&& CPhoneCenRepProxy::Instance()->
-			IsTelephonyFeatureSupported( KTelephonyLVFlagDisableCallControlHardKeysWhileLocked ) )
-		{
-    	if( !aKeylockEnabled )
-	        {
-	        // Keylock disabled
-            // Reset blocked keys list
-            iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-	        }
-		}
-    }
 	
 // ---------------------------------------------------------
 // CPhoneState::SetToolbarDimming
--- a/phoneapp/phoneuicontrol/src/cphonestateidle.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestateidle.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -430,9 +430,6 @@
     // Display incoming call
     DisplayIncomingCallL( aCallId );
 
-    // Disable HW keys and Call UI if needed
-    CheckDisableHWKeysAndCallUIL();
-    
     EndUiUpdate();
     
     EndTransEffect();
@@ -569,14 +566,10 @@
             break;
             
         case EPhoneCmdBack:
+            BeginTransEffectLC( ENumberEntryClose );
             HandleBackCommandL();
-            break;      
-     
-        case EPhoneViewOpenNumberEntry:    
-            BeginTransEffectLC( ENumberEntryCreate );
-            commandStatus = CPhoneState::HandleCommandL( aCommand );
-            EndTransEffect();        
-            break; 
+            EndTransEffect();
+            break;
             
         default:
             commandStatus = CPhoneState::HandleCommandL( aCommand );
@@ -606,9 +599,15 @@
                ResolveResourceID( EPhoneNumberAcqOkMenubar ) );
            iViewCommandHandle->ExecuteCommandL( 
                EPhoneViewMenuBarOpen, &integerParam );
-	       commandStatus = ETrue;
+           commandStatus = ETrue;
            }
-           break;       
+           break;  
+                     
+       case EPhoneViewOpenNumberEntry:	
+           BeginTransEffectLC( ENumberEntryOpen );
+           commandStatus = CPhoneState::ProcessCommandL( aCommand );
+           EndTransEffect();
+           break;
            
        default:
            commandStatus = CPhoneState::ProcessCommandL( aCommand );
@@ -679,14 +678,10 @@
             iViewCommandHandle->ExecuteCommandL( 
                 EPhoneViewActivatePreviousApp );
 
-            BeginTransEffectLC( ENumberEntryClose ); 
-
             // Remove number entry from screen
             iViewCommandHandle->ExecuteCommandL( 
                 EPhoneViewRemoveNumberEntry ); 
 
-            EndTransEffect(); 
-
             iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW ); 
             previousApp = ETrue;   
             }        
@@ -694,14 +689,10 @@
         
     if ( !previousApp )
         {
-        BeginTransEffectLC( ENumberEntryClose ); 
-
         // Remove number entry from screen
         iViewCommandHandle->ExecuteCommandL( 
             EPhoneViewRemoveNumberEntry );
-        
-        EndTransEffect();
-        
+         
         // Do state-specific operation when number entry is cleared
         HandleNumberEntryClearedL();
         }  
--- a/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -54,7 +54,6 @@
 #include "cphonemediatorsender.h"
 #include "cphonereleasecommand.h"
 #include "mphonecustomization.h"
-#include "mphonestorage.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -228,14 +227,6 @@
                 }
             break;
 
-        case EKeyDeviceF:
-                {
-                __PHONELOG( EBasic, EPhoneUIStates,
-                    "CPhoneConferenceAndSingleAndWaiting::HandleKeyMessageL-deviceF" );
-                HandleHoldSwitchL();
-                }
-            break;
-            
         default:
             break;
         }
@@ -383,15 +374,6 @@
     
     BeginTransEffectLC( ENumberEntryOpen );
 
-    if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
-         && iStateMachine->PhoneStorage()->IsScreenLocked() )
-        {
-        EnableCallUIL();
-        }
-    
-    // Reset blocked keys list
-    iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-
     BeginUiUpdateLC();
     
     // Update single call
@@ -450,16 +432,6 @@
     BeginTransEffectLC( ENumberEntryOpen );
     BeginUiUpdateLC();
 
-    // Enable call UI
-    if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
-        && iStateMachine->PhoneStorage()->IsScreenLocked() )
-        {
-        EnableCallUIL();
-        }
-
-    // Reset blocked keys list
-    iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-    
     // Remove call
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
     // Close menu bar, if it is displayed
@@ -865,33 +837,4 @@
         &callHeaderParam );
     }
 
-// ---------------------------------------------------------
-// CPhoneStateIncoming::HandleKeyLockEnabledL
-// ---------------------------------------------------------
-//
-EXPORT_C void CPhoneStateIncoming::HandleKeyLockEnabled( TBool aKeylockEnabled )
-    {
-    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIncoming::HandleKeyLockEnabledL( ) ");
-    if( !FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
-		&& CPhoneCenRepProxy::Instance()->
-			IsTelephonyFeatureSupported( KTelephonyLVFlagDisableCallControlHardKeysWhileLocked ) )
-		{
-    	if( aKeylockEnabled )
-        	{
-	        // Keylock enabled
-            if( iStateMachine->PhoneStorage()->IsBlockedKeysListEmpty() )
-                {
-                // Disable HW Keys if needed
-                DisableHWKeysL();
-                }
-	        }
-	    else
-	        {
-	        // Keylock disabled
-            // Reset blocked keys list
-            iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-	        }
-		}
-    }
-
 // End of File
--- a/phoneapp/phoneuicontrol/src/cphonestatemachine.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestatemachine.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -29,8 +29,6 @@
 #include "cphonestateincall.h"
 #include "phonestatedefinitions.h"
 #include "phonelogger.h"
-#include "cphonestorage.h"
-#include "mphonestorage.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -79,11 +77,6 @@
 	    delete iPhoneEngine;
 	    iPhoneEngine = NULL;			
 		}
-	if( iPhoneStorage )
-	    {
-	    delete iPhoneStorage;
-	    iPhoneStorage = NULL;
-	    }
     }
 
 // ---------------------------------------------------------
@@ -183,19 +176,4 @@
     PhoneEngineInfo()->SetCallId( aCallId );
     }
 
-// -----------------------------------------------------------
-// CPhoneStateMachine::PhoneStorage
-// -----------------------------------------------------------
-//
-EXPORT_C MPhoneStorage* CPhoneStateMachine::PhoneStorage()
-    {
-    if ( iPhoneStorage == NULL )
-        {
-        TInt err( KErrNone );
-        TRAP( err, iPhoneStorage = CPhoneStorage::NewL());
-        __ASSERT_ALWAYS( KErrNone == err, User::Invariant() );
-        }
-    return iPhoneStorage;
-    }
-
 // End of File
--- a/phoneapp/phoneuicontrol/src/cphonestatestartup.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestatestartup.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -143,25 +143,7 @@
     // Only go to the idle state if phone is also ready
     if ( iPhoneReady )
         {
-        // Security mode check. 
-	    TPhoneCmdParamBoolean isSecurityMode;      
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );        
-        if ( !isSecurityMode.Boolean() && !IsSimOk() )
-            {
-            TPhoneCmdParamBoolean securityMode;
-            securityMode.SetBoolean( ETrue );
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewSetSecurityMode, &securityMode );
-            iCreateNote = CIdle::NewL( CActive::EPriorityHigh );
-            
-            CreateAndShowNoteAfterIdle(); 
-            }
-        // Go to idle state
-        SetDefaultFlagsL();
-        iCbaManager->UpdateCbaL( EPhoneEmptyCBA );
-        
-        iViewCommandHandle->ExecuteCommand( EPhoneViewPrepareIcons );
-        
-        iStateMachine->ChangeState( EPhoneStateIdle );
+        InitializationReadyL();
         }
     }
 
@@ -232,26 +214,7 @@
     // Only go to idle state when Phone engine is also ready
     if ( iPEReady )
         {
-        // Security mode check.
-	    TPhoneCmdParamBoolean isSecurityMode;      
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
-        if ( !isSecurityMode.Boolean() && !IsSimOk() )
-            {
-            TPhoneCmdParamBoolean securityMode;
-            securityMode.SetBoolean( ETrue );
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewSetSecurityMode, &securityMode );
-            iCreateNote = CIdle::NewL( CActive::EPriorityHigh );
-            
-            CreateAndShowNoteAfterIdle(); 
-            }
-        // Go to idle state
-        SetDefaultFlagsL();
-        iCbaManager->UpdateCbaL( EPhoneEmptyCBA );
-        
-        iViewCommandHandle->ExecuteCommand( EPhoneViewPrepareIcons );
-        iViewCommandHandle->ExecuteCommand( EPhoneViewLoadPlugins );
-        
-        iStateMachine->ChangeState( EPhoneStateIdle );
+        InitializationReadyL();
         }
     }
 
@@ -310,4 +273,36 @@
     return KErrNone;
     }
 
+// -----------------------------------------------------------------------------
+// CPhoneStateStartup::InitializationReadyL
+//
+// -----------------------------------------------------------------------------
+//
+void CPhoneStateStartup::InitializationReadyL()
+    {
+    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateStartup::InitializationReady() ");
+
+     // Security mode check.
+    TPhoneCmdParamBoolean isSecurityMode;      
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
+    if ( !isSecurityMode.Boolean() && !IsSimOk() )
+        {
+        TPhoneCmdParamBoolean securityMode;
+        securityMode.SetBoolean( ETrue );
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetSecurityMode, &securityMode );
+        iCreateNote = CIdle::NewL( CActive::EPriorityHigh );
+        
+        CreateAndShowNoteAfterIdle(); 
+        }
+    // Go to idle state
+    SetDefaultFlagsL();
+    iCbaManager->UpdateCbaL( EPhoneEmptyCBA );
+    
+    iViewCommandHandle->ExecuteCommand( EPhoneViewPrepareIcons );
+    iViewCommandHandle->ExecuteCommand( EPhoneViewLoadPlugins );
+    
+    iStateMachine->ChangeState( EPhoneStateIdle );   
+    }
+
+
 // End of File
--- a/phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -196,15 +196,6 @@
     iStateMachine->State()->HandleIdleForegroundEventL();
     }
 
-// ---------------------------------------------------------
-// CPhoneSystemEventHandler::HandleKeyLockEnabled
-// ---------------------------------------------------------
-//
-void CPhoneSystemEventHandler::HandleKeyLockEnabled( TBool aKeylockEnabled )
-    {
-    iStateMachine->State()->HandleKeyLockEnabled( aKeylockEnabled );
-    }
-
 // -----------------------------------------------------------
 // CPhoneSystemEventHandler::HandleEnvironmentChangeL
 // -----------------------------------------------------------
--- a/phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphoneuicontroller.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -349,16 +349,6 @@
     return iStateMachine->State()->ProcessCommandL( aCommand );
     }
 
-
-// ---------------------------------------------------------
-// CPhoneUIController::HandleKeyLockEnabled
-// ---------------------------------------------------------
-//
-EXPORT_C void CPhoneUIController::HandleKeyLockEnabled( TBool aKeylockEnabled )
-    {
-    iSystemEventHandler->HandleKeyLockEnabled( aKeylockEnabled );
-    }
-
 // ---------------------------------------------------------
 // CPhoneUIController::CreateProtocolDllL
 // ---------------------------------------------------------
--- a/phoneapp/phoneuistates/bwins/phoneuistatesu.def	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/bwins/phoneuistatesu.def	Mon Mar 15 12:40:24 2010 +0200
@@ -1,73 +1,73 @@
 EXPORTS
-	??1CPhoneResourceResolverGSM@@UAE@XZ @ 1 NONAME ; CPhoneResourceResolverGSM::~CPhoneResourceResolverGSM(void)
-	?HandleKeyMessageL@CPhoneSingleCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 2 NONAME ; void CPhoneSingleCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?ConstructL@CPhoneTwoSingles@@MAEXXZ @ 3 NONAME ; void CPhoneTwoSingles::ConstructL(void)
-	??0CPhoneCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 4 NONAME ; CPhoneCallSetup::CPhoneCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?NewPhoneUIStateMachineFactoryL@@YAPAVCPhoneUIStateMachineFactoryBase@@XZ @ 5 NONAME ; class CPhoneUIStateMachineFactoryBase * NewPhoneUIStateMachineFactoryL(void)
-	?SendGlobalErrorNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 6 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalErrorNoteL(int)
-	?HandlePhoneEngineMessageL@CPhoneCallSetup@@UAEXHH@Z @ 7 NONAME ; void CPhoneCallSetup::HandlePhoneEngineMessageL(int, int)
-	?HandleKeyMessageL@CPhoneAlerting@@MAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 8 NONAME ; void CPhoneAlerting::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	?HandleCommandL@CPhoneAlerting@@MAEHH@Z @ 9 NONAME ; int CPhoneAlerting::HandleCommandL(int)
-	?HandleKeyMessageL@CPhoneTwoSingles@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 10 NONAME ; void CPhoneTwoSingles::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
-	??1CPhoneSingleCall@@UAE@XZ @ 11 NONAME ; CPhoneSingleCall::~CPhoneSingleCall(void)
-	??1CPhoneAlerting@@UAE@XZ @ 12 NONAME ; CPhoneAlerting::~CPhoneAlerting(void)
-	??0CPhoneIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 13 NONAME ; CPhoneIncoming::CPhoneIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?HandleConnectedL@CPhoneAlerting@@IAEXH@Z @ 14 NONAME ; void CPhoneAlerting::HandleConnectedL(int)
-	?ConstructL@CPhoneAlerting@@MAEXXZ @ 15 NONAME ; void CPhoneAlerting::ConstructL(void)
-	??0CPhoneSingleCall@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 16 NONAME ; CPhoneSingleCall::CPhoneSingleCall(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	??1CPhoneIncoming@@UAE@XZ @ 17 NONAME ; CPhoneIncoming::~CPhoneIncoming(void)
-	?HandleCommandL@CPhoneSingleCall@@UAEHH@Z @ 18 NONAME ; int CPhoneSingleCall::HandleCommandL(int)
-	?ConstructL@CPhoneIncoming@@MAEXXZ @ 19 NONAME ; void CPhoneIncoming::ConstructL(void)
-	?HandlePhoneEngineMessageL@CPhoneSingleCall@@UAEXHH@Z @ 20 NONAME ; void CPhoneSingleCall::HandlePhoneEngineMessageL(int, int)
-	??1CPhoneErrorMessagesHandler@@UAE@XZ @ 21 NONAME ; CPhoneErrorMessagesHandler::~CPhoneErrorMessagesHandler(void)
-	?ConstructL@CPhoneCallSetup@@MAEXXZ @ 22 NONAME ; void CPhoneCallSetup::ConstructL(void)
-	??0CPhoneErrorMessagesHandler@@IAE@PAVMPhoneViewCommandHandle@@PAVMPhoneStateMachine@@@Z @ 23 NONAME ; CPhoneErrorMessagesHandler::CPhoneErrorMessagesHandler(class MPhoneViewCommandHandle *, class MPhoneStateMachine *)
-	?HandleErrorL@CPhoneTwoSinglesAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 24 NONAME ; void CPhoneTwoSinglesAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
-	??1CPhoneTwoSingles@@UAE@XZ @ 25 NONAME ; CPhoneTwoSingles::~CPhoneTwoSingles(void)
-	?HandleDisconnectingL@CPhoneAlerting@@IAEXH@Z @ 26 NONAME ; void CPhoneAlerting::HandleDisconnectingL(int)
-	?HandleCommandL@CPhoneGsmInCall@@MAEHH@Z @ 27 NONAME ; int CPhoneGsmInCall::HandleCommandL(int)
-	?CreatePhoneEngineL@CPhoneStateMachineGSM@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 28 NONAME ; class MPEPhoneModel * CPhoneStateMachineGSM::CreatePhoneEngineL(class MEngineMonitor &)
-	?ResolveResourceID@CPhoneResourceResolverGSM@@UBEHABH@Z @ 29 NONAME ; int CPhoneResourceResolverGSM::ResolveResourceID(int const &) const
-	?HandleErrorL@CPhoneIncoming@@UAEXABUTPEErrorInfo@@@Z @ 30 NONAME ; void CPhoneIncoming::HandleErrorL(struct TPEErrorInfo const &)
-	??0CPhoneIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 31 NONAME ; CPhoneIdle::CPhoneIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?ShowErrorSpecificNoteL@CPhoneErrorMessagesHandler@@UAEXABUTPEErrorInfo@@@Z @ 32 NONAME ; void CPhoneErrorMessagesHandler::ShowErrorSpecificNoteL(struct TPEErrorInfo const &)
-	??1CPhoneStateMachineGSM@@UAE@XZ @ 33 NONAME ; CPhoneStateMachineGSM::~CPhoneStateMachineGSM(void)
-	?OpenMenuBarL@CPhoneSingleCall@@MAEXXZ @ 34 NONAME ; void CPhoneSingleCall::OpenMenuBarL(void)
-	??0CPhoneStateMachineGSM@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 35 NONAME ; CPhoneStateMachineGSM::CPhoneStateMachineGSM(class MPhoneViewCommandHandle *)
-	?SetDivertIndication@CPhoneGsmInCall@@MAEXH@Z @ 36 NONAME ; void CPhoneGsmInCall::SetDivertIndication(int)
-	?HandlePhoneEngineMessageL@CPhoneTwoSingles@@UAEXHH@Z @ 37 NONAME ; void CPhoneTwoSingles::HandlePhoneEngineMessageL(int, int)
-	?HandlePhoneEngineMessageL@CPhoneAlerting@@UAEXHH@Z @ 38 NONAME ; void CPhoneAlerting::HandlePhoneEngineMessageL(int, int)
-	?HandleRemConCommandL@CPhoneEmergency@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 39 NONAME ; int CPhoneEmergency::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
-	?ConstructL@CPhoneSingleCall@@MAEXXZ @ 40 NONAME ; void CPhoneSingleCall::ConstructL(void)
-	?HandlePhoneEngineMessageL@CPhoneIncoming@@UAEXHH@Z @ 41 NONAME ; void CPhoneIncoming::HandlePhoneEngineMessageL(int, int)
-	?State@CPhoneStateMachineGSM@@UAEPAVMPhoneState@@XZ @ 42 NONAME ; class MPhoneState * CPhoneStateMachineGSM::State(void)
-	?HandleErrorL@CPhoneIdle@@MAEXABUTPEErrorInfo@@@Z @ 43 NONAME ; void CPhoneIdle::HandleErrorL(struct TPEErrorInfo const &)
-	?HandleConnectingL@CPhoneCallSetup@@MAEXH@Z @ 44 NONAME ; void CPhoneCallSetup::HandleConnectingL(int)
-	?UpdateInCallCbaL@CPhoneTwoSingles@@MAEXXZ @ 45 NONAME ; void CPhoneTwoSingles::UpdateInCallCbaL(void)
-	?HandleErrorL@CPhoneSingleAndWaiting@@MAEXABUTPEErrorInfo@@@Z @ 46 NONAME ; void CPhoneSingleAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
-	??0CPhoneResourceResolverGSM@@IAE@XZ @ 47 NONAME ; CPhoneResourceResolverGSM::CPhoneResourceResolverGSM(void)
-	?ConstructL@CPhoneResourceResolverGSM@@IAEXXZ @ 48 NONAME ; void CPhoneResourceResolverGSM::ConstructL(void)
-	?HandlePhoneForegroundEventL@CPhoneGsmInCall@@MAEXXZ @ 49 NONAME ; void CPhoneGsmInCall::HandlePhoneForegroundEventL(void)
-	?HandlePhoneEngineMessageL@CPhoneIdle@@UAEXHH@Z @ 50 NONAME ; void CPhoneIdle::HandlePhoneEngineMessageL(int, int)
-	??1CPhoneIdle@@UAE@XZ @ 51 NONAME ; CPhoneIdle::~CPhoneIdle(void)
-	??1CPhoneCallSetup@@UAE@XZ @ 52 NONAME ; CPhoneCallSetup::~CPhoneCallSetup(void)
-	?ConstructL@CPhoneIdle@@MAEXXZ @ 53 NONAME ; void CPhoneIdle::ConstructL(void)
-	??0CPhoneAlerting@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 54 NONAME ; CPhoneAlerting::CPhoneAlerting(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?OpenMenuBarL@CPhoneAlerting@@MAEXXZ @ 55 NONAME ; void CPhoneAlerting::OpenMenuBarL(void)
-	?SendGlobalWarningNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 56 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalWarningNoteL(int)
-	?SendGlobalInfoNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 57 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalInfoNoteL(int)
-	?HandleNumberEntryClearedL@CPhoneTwoSingles@@MAEXXZ @ 58 NONAME ; void CPhoneTwoSingles::HandleNumberEntryClearedL(void)
-	?CheckIfShowCallTerminationNote@CPhoneAlerting@@MAEHXZ @ 59 NONAME ; int CPhoneAlerting::CheckIfShowCallTerminationNote(void)
-	?OpenMenuBarL@CPhoneTwoSingles@@MAEXXZ @ 60 NONAME ; void CPhoneTwoSingles::OpenMenuBarL(void)
-	??0CPhoneTwoSingles@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 61 NONAME ; CPhoneTwoSingles::CPhoneTwoSingles(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
-	?CallId@CPhoneSingleCall@@IBEHXZ @ 62 NONAME ; int CPhoneSingleCall::CallId(void) const
-	?HandleConnectedConferenceL@CPhoneTwoSingles@@MAEXH@Z @ 63 NONAME ; void CPhoneTwoSingles::HandleConnectedConferenceL(int)
-	?HandleErrorL@CPhoneConferenceAndSingleAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 64 NONAME ; void CPhoneConferenceAndSingleAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
-	?HandleErrorL@CPhoneConferenceAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 65 NONAME ; void CPhoneConferenceAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
-	?HandleErrorL@CPhoneSingleAndCallSetupAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 66 NONAME ; void CPhoneSingleAndCallSetupAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
-	?HandleErrorL@CPhoneCallSetupAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 67 NONAME ; void CPhoneCallSetupAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
-	?HandleErrorL@CPhoneConferenceAndWaitingAndCallSetup@@UAEXABUTPEErrorInfo@@@Z @ 68 NONAME ; void CPhoneConferenceAndWaitingAndCallSetup::HandleErrorL(struct TPEErrorInfo const &)
-	?HandlePhoneEngineMessageL@CPhoneStartupSimlockUi@@UAEXHH@Z @ 69 NONAME ; void CPhoneStartupSimlockUi::HandlePhoneEngineMessageL(int, int)
-	?HandlePhoneStartupL@CPhoneStartupSimlockUi@@EAEXXZ @ 70 NONAME ; void CPhoneStartupSimlockUi::HandlePhoneStartupL(void)
-	?HandlePropertyChangedL@CPhoneStartupSimlockUi@@EAEXABVTUid@@IH@Z @ 71 NONAME ; void CPhoneStartupSimlockUi::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+	?ConstructL@CPhoneTwoSingles@@MAEXXZ @ 1 NONAME ; void CPhoneTwoSingles::ConstructL(void)
+	?NewPhoneUIStateMachineFactoryL@@YAPAVCPhoneUIStateMachineFactoryBase@@XZ @ 2 NONAME ; class CPhoneUIStateMachineFactoryBase * NewPhoneUIStateMachineFactoryL(void)
+	?SendGlobalErrorNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 3 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalErrorNoteL(int)
+	?HandleKeyMessageL@CPhoneAlerting@@MAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 4 NONAME ; void CPhoneAlerting::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	?HandleKeyMessageL@CPhoneTwoSingles@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 5 NONAME ; void CPhoneTwoSingles::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	??0CPhoneIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 6 NONAME ; CPhoneIncoming::CPhoneIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	??0CPhoneSingleCall@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 7 NONAME ; CPhoneSingleCall::CPhoneSingleCall(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?HandleCommandL@CPhoneSingleCall@@UAEHH@Z @ 8 NONAME ; int CPhoneSingleCall::HandleCommandL(int)
+	?ConstructL@CPhoneCallSetup@@MAEXXZ @ 9 NONAME ; void CPhoneCallSetup::ConstructL(void)
+	??0CPhoneErrorMessagesHandler@@IAE@PAVMPhoneViewCommandHandle@@PAVMPhoneStateMachine@@@Z @ 10 NONAME ; CPhoneErrorMessagesHandler::CPhoneErrorMessagesHandler(class MPhoneViewCommandHandle *, class MPhoneStateMachine *)
+	?HandlePhoneEngineMessageL@CPhoneStartupSimlockUi@@UAEXHH@Z @ 11 NONAME ; void CPhoneStartupSimlockUi::HandlePhoneEngineMessageL(int, int)
+	??1CPhoneTwoSingles@@UAE@XZ @ 12 NONAME ; CPhoneTwoSingles::~CPhoneTwoSingles(void)
+	?HandleDisconnectingL@CPhoneAlerting@@IAEXH@Z @ 13 NONAME ; void CPhoneAlerting::HandleDisconnectingL(int)
+	??0CPhoneIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 14 NONAME ; CPhoneIdle::CPhoneIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?ShowErrorSpecificNoteL@CPhoneErrorMessagesHandler@@UAEXABUTPEErrorInfo@@@Z @ 15 NONAME ; void CPhoneErrorMessagesHandler::ShowErrorSpecificNoteL(struct TPEErrorInfo const &)
+	?HandleErrorL@CPhoneConferenceAndSingleAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 16 NONAME ; void CPhoneConferenceAndSingleAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
+	??0CPhoneStateMachineGSM@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 17 NONAME ; CPhoneStateMachineGSM::CPhoneStateMachineGSM(class MPhoneViewCommandHandle *)
+	?SetDivertIndication@CPhoneGsmInCall@@MAEXH@Z @ 18 NONAME ; void CPhoneGsmInCall::SetDivertIndication(int)
+	?HandlePhoneEngineMessageL@CPhoneAlerting@@UAEXHH@Z @ 19 NONAME ; void CPhoneAlerting::HandlePhoneEngineMessageL(int, int)
+	?ConstructL@CPhoneSingleCall@@MAEXXZ @ 20 NONAME ; void CPhoneSingleCall::ConstructL(void)
+	?HandlePhoneEngineMessageL@CPhoneIncoming@@UAEXHH@Z @ 21 NONAME ; void CPhoneIncoming::HandlePhoneEngineMessageL(int, int)
+	?State@CPhoneStateMachineGSM@@UAEPAVMPhoneState@@XZ @ 22 NONAME ; class MPhoneState * CPhoneStateMachineGSM::State(void)
+	?HandleErrorL@CPhoneIdle@@MAEXABUTPEErrorInfo@@@Z @ 23 NONAME ; void CPhoneIdle::HandleErrorL(struct TPEErrorInfo const &)
+	?HandleConnectingL@CPhoneCallSetup@@MAEXH@Z @ 24 NONAME ; void CPhoneCallSetup::HandleConnectingL(int)
+	?HandleErrorL@CPhoneSingleAndWaiting@@MAEXABUTPEErrorInfo@@@Z @ 25 NONAME ; void CPhoneSingleAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
+	??0CPhoneResourceResolverGSM@@IAE@XZ @ 26 NONAME ; CPhoneResourceResolverGSM::CPhoneResourceResolverGSM(void)
+	?ConstructL@CPhoneResourceResolverGSM@@IAEXXZ @ 27 NONAME ; void CPhoneResourceResolverGSM::ConstructL(void)
+	?HandlePhoneEngineMessageL@CPhoneIdle@@UAEXHH@Z @ 28 NONAME ; void CPhoneIdle::HandlePhoneEngineMessageL(int, int)
+	??1CPhoneIdle@@UAE@XZ @ 29 NONAME ; CPhoneIdle::~CPhoneIdle(void)
+	??1CPhoneCallSetup@@UAE@XZ @ 30 NONAME ; CPhoneCallSetup::~CPhoneCallSetup(void)
+	??0CPhoneAlerting@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 31 NONAME ; CPhoneAlerting::CPhoneAlerting(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?SendGlobalInfoNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 32 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalInfoNoteL(int)
+	?HandleNumberEntryClearedL@CPhoneTwoSingles@@MAEXXZ @ 33 NONAME ; void CPhoneTwoSingles::HandleNumberEntryClearedL(void)
+	?CheckIfShowCallTerminationNote@CPhoneAlerting@@MAEHXZ @ 34 NONAME ; int CPhoneAlerting::CheckIfShowCallTerminationNote(void)
+	?OpenMenuBarL@CPhoneTwoSingles@@MAEXXZ @ 35 NONAME ; void CPhoneTwoSingles::OpenMenuBarL(void)
+	?CallId@CPhoneSingleCall@@IBEHXZ @ 36 NONAME ; int CPhoneSingleCall::CallId(void) const
+	??1CPhoneResourceResolverGSM@@UAE@XZ @ 37 NONAME ; CPhoneResourceResolverGSM::~CPhoneResourceResolverGSM(void)
+	?HandleKeyMessageL@CPhoneSingleCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 38 NONAME ; void CPhoneSingleCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+	??0CPhoneCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 39 NONAME ; CPhoneCallSetup::CPhoneCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?HandlePhoneEngineMessageL@CPhoneCallSetup@@UAEXHH@Z @ 40 NONAME ; void CPhoneCallSetup::HandlePhoneEngineMessageL(int, int)
+	?HandleCommandL@CPhoneAlerting@@MAEHH@Z @ 41 NONAME ; int CPhoneAlerting::HandleCommandL(int)
+	?HandleErrorL@CPhoneSingleAndCallSetupAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 42 NONAME ; void CPhoneSingleAndCallSetupAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
+	??1CPhoneSingleCall@@UAE@XZ @ 43 NONAME ; CPhoneSingleCall::~CPhoneSingleCall(void)
+	??1CPhoneAlerting@@UAE@XZ @ 44 NONAME ; CPhoneAlerting::~CPhoneAlerting(void)
+	?HandleConnectedL@CPhoneAlerting@@IAEXH@Z @ 45 NONAME ; void CPhoneAlerting::HandleConnectedL(int)
+	?ConstructL@CPhoneAlerting@@MAEXXZ @ 46 NONAME ; void CPhoneAlerting::ConstructL(void)
+	?HandleErrorL@CPhoneCallSetupAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 47 NONAME ; void CPhoneCallSetupAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
+	??1CPhoneIncoming@@UAE@XZ @ 48 NONAME ; CPhoneIncoming::~CPhoneIncoming(void)
+	?HandlePhoneStartupL@CPhoneStartupSimlockUi@@EAEXXZ @ 49 NONAME ; void CPhoneStartupSimlockUi::HandlePhoneStartupL(void)
+	?ConstructL@CPhoneIncoming@@MAEXXZ @ 50 NONAME ; void CPhoneIncoming::ConstructL(void)
+	?HandleErrorL@CPhoneConferenceAndWaitingAndCallSetup@@UAEXABUTPEErrorInfo@@@Z @ 51 NONAME ; void CPhoneConferenceAndWaitingAndCallSetup::HandleErrorL(struct TPEErrorInfo const &)
+	?HandlePhoneEngineMessageL@CPhoneSingleCall@@UAEXHH@Z @ 52 NONAME ; void CPhoneSingleCall::HandlePhoneEngineMessageL(int, int)
+	??1CPhoneErrorMessagesHandler@@UAE@XZ @ 53 NONAME ; CPhoneErrorMessagesHandler::~CPhoneErrorMessagesHandler(void)
+	?HandleErrorL@CPhoneTwoSinglesAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 54 NONAME ; void CPhoneTwoSinglesAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
+	?CreatePhoneEngineL@CPhoneStateMachineGSM@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 55 NONAME ; class MPEPhoneModel * CPhoneStateMachineGSM::CreatePhoneEngineL(class MEngineMonitor &)
+	?HandleCommandL@CPhoneGsmInCall@@MAEHH@Z @ 56 NONAME ; int CPhoneGsmInCall::HandleCommandL(int)
+	?ResolveResourceID@CPhoneResourceResolverGSM@@UBEHABH@Z @ 57 NONAME ; int CPhoneResourceResolverGSM::ResolveResourceID(int const &) const
+	?HandleErrorL@CPhoneIncoming@@UAEXABUTPEErrorInfo@@@Z @ 58 NONAME ; void CPhoneIncoming::HandleErrorL(struct TPEErrorInfo const &)
+	??1CPhoneStateMachineGSM@@UAE@XZ @ 59 NONAME ; CPhoneStateMachineGSM::~CPhoneStateMachineGSM(void)
+	?OpenMenuBarL@CPhoneSingleCall@@MAEXXZ @ 60 NONAME ; void CPhoneSingleCall::OpenMenuBarL(void)
+	?HandleErrorL@CPhoneConferenceAndWaiting@@UAEXABUTPEErrorInfo@@@Z @ 61 NONAME ; void CPhoneConferenceAndWaiting::HandleErrorL(struct TPEErrorInfo const &)
+	?HandlePhoneEngineMessageL@CPhoneTwoSingles@@UAEXHH@Z @ 62 NONAME ; void CPhoneTwoSingles::HandlePhoneEngineMessageL(int, int)
+	?HandleRemConCommandL@CPhoneEmergency@@MAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 63 NONAME ; int CPhoneEmergency::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+	?UpdateInCallCbaL@CPhoneTwoSingles@@MAEXXZ @ 64 NONAME ; void CPhoneTwoSingles::UpdateInCallCbaL(void)
+	?ConstructL@CPhoneIdle@@MAEXXZ @ 65 NONAME ; void CPhoneIdle::ConstructL(void)
+	?HandlePhoneForegroundEventL@CPhoneGsmInCall@@MAEXXZ @ 66 NONAME ; void CPhoneGsmInCall::HandlePhoneForegroundEventL(void)
+	?OpenMenuBarL@CPhoneAlerting@@MAEXXZ @ 67 NONAME ; void CPhoneAlerting::OpenMenuBarL(void)
+	?SendGlobalWarningNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 68 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalWarningNoteL(int)
+	?HandleConnectedConferenceL@CPhoneTwoSingles@@MAEXH@Z @ 69 NONAME ; void CPhoneTwoSingles::HandleConnectedConferenceL(int)
+	??0CPhoneTwoSingles@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 70 NONAME ; CPhoneTwoSingles::CPhoneTwoSingles(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+	?HandlePropertyChangedL@CPhoneStartupSimlockUi@@UAEXABVTUid@@IH@Z @ 71 NONAME ; void CPhoneStartupSimlockUi::HandlePropertyChangedL(class TUid const &, unsigned int, int)
 
--- a/phoneapp/phoneuistates/eabi/phoneuistatesu.def	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/eabi/phoneuistatesu.def	Mon Mar 15 12:40:24 2010 +0200
@@ -71,206 +71,206 @@
 	_ZN21CPhoneStateMachineGSMD1Ev @ 70 NONAME
 	_ZN21CPhoneStateMachineGSMD2Ev @ 71 NONAME
 	_ZN22CPhoneSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 72 NONAME
-	_ZN25CPhoneResourceResolverGSM10ConstructLEv @ 73 NONAME
-	_ZN25CPhoneResourceResolverGSMC1Ev @ 74 NONAME
-	_ZN25CPhoneResourceResolverGSMC2Ev @ 75 NONAME
-	_ZN25CPhoneResourceResolverGSMD0Ev @ 76 NONAME
-	_ZN25CPhoneResourceResolverGSMD1Ev @ 77 NONAME
-	_ZN25CPhoneResourceResolverGSMD2Ev @ 78 NONAME
-	_ZN26CPhoneErrorMessagesHandler19SendGlobalInfoNoteLEi @ 79 NONAME
-	_ZN26CPhoneErrorMessagesHandler20SendGlobalErrorNoteLEi @ 80 NONAME
-	_ZN26CPhoneErrorMessagesHandler22SendGlobalWarningNoteLEi @ 81 NONAME
-	_ZN26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 82 NONAME
-	_ZN26CPhoneErrorMessagesHandlerC1EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 83 NONAME
-	_ZN26CPhoneErrorMessagesHandlerC2EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 84 NONAME
-	_ZN26CPhoneErrorMessagesHandlerD0Ev @ 85 NONAME
-	_ZN26CPhoneErrorMessagesHandlerD1Ev @ 86 NONAME
-	_ZN26CPhoneErrorMessagesHandlerD2Ev @ 87 NONAME
-	_ZN26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 88 NONAME
-	_ZNK16CPhoneSingleCall6CallIdEv @ 89 NONAME
-	_ZNK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 90 NONAME
-	_ZTI10CPhoneIdle @ 91 NONAME
-	_ZTI13CPhoneStartup @ 92 NONAME
-	_ZTI14CPhoneAlerting @ 93 NONAME
-	_ZTI14CPhoneIncoming @ 94 NONAME
-	_ZTI15CPhoneCallSetup @ 95 NONAME
-	_ZTI15CPhoneEmergency @ 96 NONAME
-	_ZTI15CPhoneGsmInCall @ 97 NONAME
-	_ZTI16CPhoneConference @ 98 NONAME
-	_ZTI16CPhoneSingleCall @ 99 NONAME
-	_ZTI16CPhoneTwoSingles @ 100 NONAME
-	_ZTI21CPhoneStateMachineGSM @ 101 NONAME
-	_ZTI22CPhoneSingleAndWaiting @ 102 NONAME
-	_ZTI23CPhoneSingleAndAlerting @ 103 NONAME
-	_ZTI24CPhoneSingleAndCallSetup @ 104 NONAME
-	_ZTI25CPhoneCallSetupAndWaiting @ 105 NONAME
-	_ZTI25CPhoneConferenceAndSingle @ 106 NONAME
-	_ZTI25CPhoneResourceResolverGSM @ 107 NONAME
-	_ZTI26CPhoneConferenceAndWaiting @ 108 NONAME
-	_ZTI26CPhoneErrorMessagesHandler @ 109 NONAME
-	_ZTI26CPhoneTwoSinglesAndWaiting @ 110 NONAME
-	_ZTI28CPhoneConferenceAndCallSetup @ 111 NONAME
-	_ZTI30CPhoneUIStateMachineFactoryGSM @ 112 NONAME
-	_ZTI31CPhoneGeneralGsmMessagesHandler @ 113 NONAME
-	_ZTI34CPhoneSingleAndCallSetupAndWaiting @ 114 NONAME
-	_ZTI35CPhoneConferenceAndSingleAndWaiting @ 115 NONAME
-	_ZTI38CPhoneConferenceAndWaitingAndCallSetup @ 116 NONAME
-	_ZTV10CPhoneIdle @ 117 NONAME
-	_ZTV13CPhoneStartup @ 118 NONAME
-	_ZTV14CPhoneAlerting @ 119 NONAME
-	_ZTV14CPhoneIncoming @ 120 NONAME
-	_ZTV15CPhoneCallSetup @ 121 NONAME
-	_ZTV15CPhoneEmergency @ 122 NONAME
-	_ZTV15CPhoneGsmInCall @ 123 NONAME
-	_ZTV16CPhoneConference @ 124 NONAME
-	_ZTV16CPhoneSingleCall @ 125 NONAME
-	_ZTV16CPhoneTwoSingles @ 126 NONAME
-	_ZTV21CPhoneStateMachineGSM @ 127 NONAME
-	_ZTV22CPhoneSingleAndWaiting @ 128 NONAME
-	_ZTV23CPhoneSingleAndAlerting @ 129 NONAME
-	_ZTV24CPhoneSingleAndCallSetup @ 130 NONAME
-	_ZTV25CPhoneCallSetupAndWaiting @ 131 NONAME
-	_ZTV25CPhoneConferenceAndSingle @ 132 NONAME
-	_ZTV25CPhoneResourceResolverGSM @ 133 NONAME
-	_ZTV26CPhoneConferenceAndWaiting @ 134 NONAME
-	_ZTV26CPhoneErrorMessagesHandler @ 135 NONAME
-	_ZTV26CPhoneTwoSinglesAndWaiting @ 136 NONAME
-	_ZTV28CPhoneConferenceAndCallSetup @ 137 NONAME
-	_ZTV30CPhoneUIStateMachineFactoryGSM @ 138 NONAME
-	_ZTV31CPhoneGeneralGsmMessagesHandler @ 139 NONAME
-	_ZTV34CPhoneSingleAndCallSetupAndWaiting @ 140 NONAME
-	_ZTV35CPhoneConferenceAndSingleAndWaiting @ 141 NONAME
-	_ZTV38CPhoneConferenceAndWaitingAndCallSetup @ 142 NONAME
-	_ZThn12_N10CPhoneIdleD0Ev @ 143 NONAME
-	_ZThn12_N10CPhoneIdleD1Ev @ 144 NONAME
-	_ZThn12_N14CPhoneAlertingD0Ev @ 145 NONAME
-	_ZThn12_N14CPhoneAlertingD1Ev @ 146 NONAME
-	_ZThn12_N14CPhoneIncomingD0Ev @ 147 NONAME
-	_ZThn12_N14CPhoneIncomingD1Ev @ 148 NONAME
-	_ZThn12_N15CPhoneCallSetupD0Ev @ 149 NONAME
-	_ZThn12_N15CPhoneCallSetupD1Ev @ 150 NONAME
-	_ZThn12_N15CPhoneGsmInCall27HandlePhoneForegroundEventLEv @ 151 NONAME
-	_ZThn12_N16CPhoneSingleCallD0Ev @ 152 NONAME
-	_ZThn12_N16CPhoneSingleCallD1Ev @ 153 NONAME
-	_ZThn12_N16CPhoneTwoSinglesD0Ev @ 154 NONAME
-	_ZThn12_N16CPhoneTwoSinglesD1Ev @ 155 NONAME
-	_ZThn16_N10CPhoneIdleD0Ev @ 156 NONAME
-	_ZThn16_N10CPhoneIdleD1Ev @ 157 NONAME
-	_ZThn16_N14CPhoneAlerting14HandleCommandLEi @ 158 NONAME
-	_ZThn16_N14CPhoneAlertingD0Ev @ 159 NONAME
-	_ZThn16_N14CPhoneAlertingD1Ev @ 160 NONAME
-	_ZThn16_N14CPhoneIncomingD0Ev @ 161 NONAME
-	_ZThn16_N14CPhoneIncomingD1Ev @ 162 NONAME
-	_ZThn16_N15CPhoneCallSetupD0Ev @ 163 NONAME
-	_ZThn16_N15CPhoneCallSetupD1Ev @ 164 NONAME
-	_ZThn16_N15CPhoneGsmInCall14HandleCommandLEi @ 165 NONAME
-	_ZThn16_N16CPhoneSingleCall14HandleCommandLEi @ 166 NONAME
-	_ZThn16_N16CPhoneSingleCallD0Ev @ 167 NONAME
-	_ZThn16_N16CPhoneSingleCallD1Ev @ 168 NONAME
-	_ZThn16_N16CPhoneTwoSinglesD0Ev @ 169 NONAME
-	_ZThn16_N16CPhoneTwoSinglesD1Ev @ 170 NONAME
-	_ZThn20_N10CPhoneIdleD0Ev @ 171 NONAME
-	_ZThn20_N10CPhoneIdleD1Ev @ 172 NONAME
-	_ZThn20_N14CPhoneAlertingD0Ev @ 173 NONAME
-	_ZThn20_N14CPhoneAlertingD1Ev @ 174 NONAME
-	_ZThn20_N14CPhoneIncomingD0Ev @ 175 NONAME
-	_ZThn20_N14CPhoneIncomingD1Ev @ 176 NONAME
-	_ZThn20_N15CPhoneCallSetupD0Ev @ 177 NONAME
-	_ZThn20_N15CPhoneCallSetupD1Ev @ 178 NONAME
-	_ZThn20_N15CPhoneEmergency20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 179 NONAME
-	_ZThn20_N16CPhoneSingleCallD0Ev @ 180 NONAME
-	_ZThn20_N16CPhoneSingleCallD1Ev @ 181 NONAME
-	_ZThn20_N16CPhoneTwoSinglesD0Ev @ 182 NONAME
-	_ZThn20_N16CPhoneTwoSinglesD1Ev @ 183 NONAME
-	_ZThn24_N10CPhoneIdleD0Ev @ 184 NONAME
-	_ZThn24_N10CPhoneIdleD1Ev @ 185 NONAME
-	_ZThn24_N14CPhoneAlertingD0Ev @ 186 NONAME
-	_ZThn24_N14CPhoneAlertingD1Ev @ 187 NONAME
-	_ZThn24_N14CPhoneIncomingD0Ev @ 188 NONAME
-	_ZThn24_N14CPhoneIncomingD1Ev @ 189 NONAME
-	_ZThn24_N15CPhoneCallSetupD0Ev @ 190 NONAME
-	_ZThn24_N15CPhoneCallSetupD1Ev @ 191 NONAME
-	_ZThn24_N15CPhoneGsmInCall19SetDivertIndicationEi @ 192 NONAME
-	_ZThn24_N16CPhoneSingleCallD0Ev @ 193 NONAME
-	_ZThn24_N16CPhoneSingleCallD1Ev @ 194 NONAME
-	_ZThn24_N16CPhoneTwoSinglesD0Ev @ 195 NONAME
-	_ZThn24_N16CPhoneTwoSinglesD1Ev @ 196 NONAME
-	_ZThn32_N16CPhoneTwoSingles25HandleNumberEntryClearedLEv @ 197 NONAME
-	_ZThn36_N10CPhoneIdleD0Ev @ 198 NONAME
-	_ZThn36_N10CPhoneIdleD1Ev @ 199 NONAME
-	_ZThn36_N14CPhoneAlertingD0Ev @ 200 NONAME
-	_ZThn36_N14CPhoneAlertingD1Ev @ 201 NONAME
-	_ZThn36_N14CPhoneIncomingD0Ev @ 202 NONAME
-	_ZThn36_N14CPhoneIncomingD1Ev @ 203 NONAME
-	_ZThn36_N15CPhoneCallSetupD0Ev @ 204 NONAME
-	_ZThn36_N15CPhoneCallSetupD1Ev @ 205 NONAME
-	_ZThn36_N16CPhoneSingleCallD0Ev @ 206 NONAME
-	_ZThn36_N16CPhoneSingleCallD1Ev @ 207 NONAME
-	_ZThn36_N16CPhoneTwoSinglesD0Ev @ 208 NONAME
-	_ZThn36_N16CPhoneTwoSinglesD1Ev @ 209 NONAME
-	_ZThn4_N10CPhoneIdle12HandleErrorLERK12TPEErrorInfo @ 210 NONAME
-	_ZThn4_N10CPhoneIdle25HandlePhoneEngineMessageLEii @ 211 NONAME
-	_ZThn4_N10CPhoneIdleD0Ev @ 212 NONAME
-	_ZThn4_N10CPhoneIdleD1Ev @ 213 NONAME
-	_ZThn4_N14CPhoneAlerting25HandlePhoneEngineMessageLEii @ 214 NONAME
-	_ZThn4_N14CPhoneAlertingD0Ev @ 215 NONAME
-	_ZThn4_N14CPhoneAlertingD1Ev @ 216 NONAME
-	_ZThn4_N14CPhoneIncoming12HandleErrorLERK12TPEErrorInfo @ 217 NONAME
-	_ZThn4_N14CPhoneIncoming25HandlePhoneEngineMessageLEii @ 218 NONAME
-	_ZThn4_N14CPhoneIncomingD0Ev @ 219 NONAME
-	_ZThn4_N14CPhoneIncomingD1Ev @ 220 NONAME
-	_ZThn4_N15CPhoneCallSetup25HandlePhoneEngineMessageLEii @ 221 NONAME
-	_ZThn4_N15CPhoneCallSetupD0Ev @ 222 NONAME
-	_ZThn4_N15CPhoneCallSetupD1Ev @ 223 NONAME
-	_ZThn4_N16CPhoneSingleCall25HandlePhoneEngineMessageLEii @ 224 NONAME
-	_ZThn4_N16CPhoneSingleCallD0Ev @ 225 NONAME
-	_ZThn4_N16CPhoneSingleCallD1Ev @ 226 NONAME
-	_ZThn4_N16CPhoneTwoSingles25HandlePhoneEngineMessageLEii @ 227 NONAME
-	_ZThn4_N16CPhoneTwoSinglesD0Ev @ 228 NONAME
-	_ZThn4_N16CPhoneTwoSinglesD1Ev @ 229 NONAME
-	_ZThn4_N21CPhoneStateMachineGSM18CreatePhoneEngineLER14MEngineMonitor @ 230 NONAME
-	_ZThn4_N21CPhoneStateMachineGSM5StateEv @ 231 NONAME
-	_ZThn4_N21CPhoneStateMachineGSMD0Ev @ 232 NONAME
-	_ZThn4_N21CPhoneStateMachineGSMD1Ev @ 233 NONAME
-	_ZThn4_N22CPhoneSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 234 NONAME
-	_ZThn4_N25CPhoneResourceResolverGSMD0Ev @ 235 NONAME
-	_ZThn4_N25CPhoneResourceResolverGSMD1Ev @ 236 NONAME
-	_ZThn4_N26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 237 NONAME
-	_ZThn4_N26CPhoneErrorMessagesHandlerD0Ev @ 238 NONAME
-	_ZThn4_N26CPhoneErrorMessagesHandlerD1Ev @ 239 NONAME
-	_ZThn4_N26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 240 NONAME
-	_ZThn4_NK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 241 NONAME
-	_ZThn8_N10CPhoneIdleD0Ev @ 242 NONAME
-	_ZThn8_N10CPhoneIdleD1Ev @ 243 NONAME
-	_ZThn8_N14CPhoneAlerting17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 244 NONAME
-	_ZThn8_N14CPhoneAlertingD0Ev @ 245 NONAME
-	_ZThn8_N14CPhoneAlertingD1Ev @ 246 NONAME
-	_ZThn8_N14CPhoneIncomingD0Ev @ 247 NONAME
-	_ZThn8_N14CPhoneIncomingD1Ev @ 248 NONAME
-	_ZThn8_N15CPhoneCallSetupD0Ev @ 249 NONAME
-	_ZThn8_N15CPhoneCallSetupD1Ev @ 250 NONAME
-	_ZThn8_N16CPhoneSingleCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 251 NONAME
-	_ZThn8_N16CPhoneSingleCallD0Ev @ 252 NONAME
-	_ZThn8_N16CPhoneSingleCallD1Ev @ 253 NONAME
-	_ZThn8_N16CPhoneTwoSingles17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 254 NONAME
-	_ZThn8_N16CPhoneTwoSinglesD0Ev @ 255 NONAME
-	_ZThn8_N16CPhoneTwoSinglesD1Ev @ 256 NONAME
-	_ZN26CPhoneConferenceAndWaiting12HandleErrorLERK12TPEErrorInfo @ 257 NONAME
-	_ZN35CPhoneConferenceAndSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 258 NONAME
-	_ZThn4_N26CPhoneConferenceAndWaiting12HandleErrorLERK12TPEErrorInfo @ 259 NONAME
-	_ZThn4_N35CPhoneConferenceAndSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 260 NONAME
-	_ZN25CPhoneCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 261 NONAME
-	_ZN34CPhoneSingleAndCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 262 NONAME
-	_ZN38CPhoneConferenceAndWaitingAndCallSetup12HandleErrorLERK12TPEErrorInfo @ 263 NONAME
-	_ZThn4_N25CPhoneCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 264 NONAME
-	_ZThn4_N34CPhoneSingleAndCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 265 NONAME
-	_ZThn4_N38CPhoneConferenceAndWaitingAndCallSetup12HandleErrorLERK12TPEErrorInfo @ 266 NONAME
-	_ZN22CPhoneStartupSimlockUi19HandlePhoneStartupLEv @ 267 NONAME
-	_ZN22CPhoneStartupSimlockUi22HandlePropertyChangedLERK4TUidji @ 268 NONAME
-	_ZN22CPhoneStartupSimlockUi25HandlePhoneEngineMessageLEii @ 269 NONAME
-	_ZTI22CPhoneStartupSimlockUi @ 270 NONAME
-	_ZTV22CPhoneStartupSimlockUi @ 271 NONAME
-	_ZThn12_N22CPhoneStartupSimlockUi19HandlePhoneStartupLEv @ 272 NONAME
-	_ZThn12_N22CPhoneStartupSimlockUi22HandlePropertyChangedLERK4TUidji @ 273 NONAME
-	_ZThn4_N22CPhoneStartupSimlockUi25HandlePhoneEngineMessageLEii @ 274 NONAME
+	_ZN22CPhoneStartupSimlockUi19HandlePhoneStartupLEv @ 73 NONAME
+	_ZN22CPhoneStartupSimlockUi22HandlePropertyChangedLERK4TUidji @ 74 NONAME
+	_ZN22CPhoneStartupSimlockUi25HandlePhoneEngineMessageLEii @ 75 NONAME
+	_ZN25CPhoneCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 76 NONAME
+	_ZN25CPhoneResourceResolverGSM10ConstructLEv @ 77 NONAME
+	_ZN25CPhoneResourceResolverGSMC1Ev @ 78 NONAME
+	_ZN25CPhoneResourceResolverGSMC2Ev @ 79 NONAME
+	_ZN25CPhoneResourceResolverGSMD0Ev @ 80 NONAME
+	_ZN25CPhoneResourceResolverGSMD1Ev @ 81 NONAME
+	_ZN25CPhoneResourceResolverGSMD2Ev @ 82 NONAME
+	_ZN26CPhoneConferenceAndWaiting12HandleErrorLERK12TPEErrorInfo @ 83 NONAME
+	_ZN26CPhoneErrorMessagesHandler19SendGlobalInfoNoteLEi @ 84 NONAME
+	_ZN26CPhoneErrorMessagesHandler20SendGlobalErrorNoteLEi @ 85 NONAME
+	_ZN26CPhoneErrorMessagesHandler22SendGlobalWarningNoteLEi @ 86 NONAME
+	_ZN26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 87 NONAME
+	_ZN26CPhoneErrorMessagesHandlerC1EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 88 NONAME
+	_ZN26CPhoneErrorMessagesHandlerC2EP23MPhoneViewCommandHandleP18MPhoneStateMachine @ 89 NONAME
+	_ZN26CPhoneErrorMessagesHandlerD0Ev @ 90 NONAME
+	_ZN26CPhoneErrorMessagesHandlerD1Ev @ 91 NONAME
+	_ZN26CPhoneErrorMessagesHandlerD2Ev @ 92 NONAME
+	_ZN26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 93 NONAME
+	_ZN34CPhoneSingleAndCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 94 NONAME
+	_ZN35CPhoneConferenceAndSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 95 NONAME
+	_ZN38CPhoneConferenceAndWaitingAndCallSetup12HandleErrorLERK12TPEErrorInfo @ 96 NONAME
+	_ZNK16CPhoneSingleCall6CallIdEv @ 97 NONAME
+	_ZNK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 98 NONAME
+	_ZTI10CPhoneIdle @ 99 NONAME
+	_ZTI13CPhoneStartup @ 100 NONAME
+	_ZTI14CPhoneAlerting @ 101 NONAME
+	_ZTI14CPhoneIncoming @ 102 NONAME
+	_ZTI15CPhoneCallSetup @ 103 NONAME
+	_ZTI15CPhoneEmergency @ 104 NONAME
+	_ZTI15CPhoneGsmInCall @ 105 NONAME
+	_ZTI16CPhoneConference @ 106 NONAME
+	_ZTI16CPhoneSingleCall @ 107 NONAME
+	_ZTI16CPhoneTwoSingles @ 108 NONAME
+	_ZTI21CPhoneStateMachineGSM @ 109 NONAME
+	_ZTI22CPhoneSingleAndWaiting @ 110 NONAME
+	_ZTI22CPhoneStartupSimlockUi @ 111 NONAME
+	_ZTI23CPhoneSingleAndAlerting @ 112 NONAME
+	_ZTI24CPhoneSingleAndCallSetup @ 113 NONAME
+	_ZTI25CPhoneCallSetupAndWaiting @ 114 NONAME
+	_ZTI25CPhoneConferenceAndSingle @ 115 NONAME
+	_ZTI25CPhoneResourceResolverGSM @ 116 NONAME
+	_ZTI26CPhoneConferenceAndWaiting @ 117 NONAME
+	_ZTI26CPhoneErrorMessagesHandler @ 118 NONAME
+	_ZTI26CPhoneTwoSinglesAndWaiting @ 119 NONAME
+	_ZTI28CPhoneConferenceAndCallSetup @ 120 NONAME
+	_ZTI30CPhoneUIStateMachineFactoryGSM @ 121 NONAME
+	_ZTI31CPhoneGeneralGsmMessagesHandler @ 122 NONAME
+	_ZTI34CPhoneSingleAndCallSetupAndWaiting @ 123 NONAME
+	_ZTI35CPhoneConferenceAndSingleAndWaiting @ 124 NONAME
+	_ZTI38CPhoneConferenceAndWaitingAndCallSetup @ 125 NONAME
+	_ZTV10CPhoneIdle @ 126 NONAME
+	_ZTV13CPhoneStartup @ 127 NONAME
+	_ZTV14CPhoneAlerting @ 128 NONAME
+	_ZTV14CPhoneIncoming @ 129 NONAME
+	_ZTV15CPhoneCallSetup @ 130 NONAME
+	_ZTV15CPhoneEmergency @ 131 NONAME
+	_ZTV15CPhoneGsmInCall @ 132 NONAME
+	_ZTV16CPhoneConference @ 133 NONAME
+	_ZTV16CPhoneSingleCall @ 134 NONAME
+	_ZTV16CPhoneTwoSingles @ 135 NONAME
+	_ZTV21CPhoneStateMachineGSM @ 136 NONAME
+	_ZTV22CPhoneSingleAndWaiting @ 137 NONAME
+	_ZTV22CPhoneStartupSimlockUi @ 138 NONAME
+	_ZTV23CPhoneSingleAndAlerting @ 139 NONAME
+	_ZTV24CPhoneSingleAndCallSetup @ 140 NONAME
+	_ZTV25CPhoneCallSetupAndWaiting @ 141 NONAME
+	_ZTV25CPhoneConferenceAndSingle @ 142 NONAME
+	_ZTV25CPhoneResourceResolverGSM @ 143 NONAME
+	_ZTV26CPhoneConferenceAndWaiting @ 144 NONAME
+	_ZTV26CPhoneErrorMessagesHandler @ 145 NONAME
+	_ZTV26CPhoneTwoSinglesAndWaiting @ 146 NONAME
+	_ZTV28CPhoneConferenceAndCallSetup @ 147 NONAME
+	_ZTV30CPhoneUIStateMachineFactoryGSM @ 148 NONAME
+	_ZTV31CPhoneGeneralGsmMessagesHandler @ 149 NONAME
+	_ZTV34CPhoneSingleAndCallSetupAndWaiting @ 150 NONAME
+	_ZTV35CPhoneConferenceAndSingleAndWaiting @ 151 NONAME
+	_ZTV38CPhoneConferenceAndWaitingAndCallSetup @ 152 NONAME
+	_ZThn12_N10CPhoneIdleD0Ev @ 153 NONAME
+	_ZThn12_N10CPhoneIdleD1Ev @ 154 NONAME
+	_ZThn12_N14CPhoneAlertingD0Ev @ 155 NONAME
+	_ZThn12_N14CPhoneAlertingD1Ev @ 156 NONAME
+	_ZThn12_N14CPhoneIncomingD0Ev @ 157 NONAME
+	_ZThn12_N14CPhoneIncomingD1Ev @ 158 NONAME
+	_ZThn12_N15CPhoneCallSetupD0Ev @ 159 NONAME
+	_ZThn12_N15CPhoneCallSetupD1Ev @ 160 NONAME
+	_ZThn12_N15CPhoneGsmInCall27HandlePhoneForegroundEventLEv @ 161 NONAME
+	_ZThn12_N16CPhoneSingleCallD0Ev @ 162 NONAME
+	_ZThn12_N16CPhoneSingleCallD1Ev @ 163 NONAME
+	_ZThn12_N16CPhoneTwoSinglesD0Ev @ 164 NONAME
+	_ZThn12_N16CPhoneTwoSinglesD1Ev @ 165 NONAME
+	_ZThn12_N22CPhoneStartupSimlockUi19HandlePhoneStartupLEv @ 166 NONAME
+	_ZThn12_N22CPhoneStartupSimlockUi22HandlePropertyChangedLERK4TUidji @ 167 NONAME
+	_ZThn16_N10CPhoneIdleD0Ev @ 168 NONAME
+	_ZThn16_N10CPhoneIdleD1Ev @ 169 NONAME
+	_ZThn16_N14CPhoneAlerting14HandleCommandLEi @ 170 NONAME
+	_ZThn16_N14CPhoneAlertingD0Ev @ 171 NONAME
+	_ZThn16_N14CPhoneAlertingD1Ev @ 172 NONAME
+	_ZThn16_N14CPhoneIncomingD0Ev @ 173 NONAME
+	_ZThn16_N14CPhoneIncomingD1Ev @ 174 NONAME
+	_ZThn16_N15CPhoneCallSetupD0Ev @ 175 NONAME
+	_ZThn16_N15CPhoneCallSetupD1Ev @ 176 NONAME
+	_ZThn16_N15CPhoneGsmInCall14HandleCommandLEi @ 177 NONAME
+	_ZThn16_N16CPhoneSingleCall14HandleCommandLEi @ 178 NONAME
+	_ZThn16_N16CPhoneSingleCallD0Ev @ 179 NONAME
+	_ZThn16_N16CPhoneSingleCallD1Ev @ 180 NONAME
+	_ZThn16_N16CPhoneTwoSinglesD0Ev @ 181 NONAME
+	_ZThn16_N16CPhoneTwoSinglesD1Ev @ 182 NONAME
+	_ZThn20_N10CPhoneIdleD0Ev @ 183 NONAME
+	_ZThn20_N10CPhoneIdleD1Ev @ 184 NONAME
+	_ZThn20_N14CPhoneAlertingD0Ev @ 185 NONAME
+	_ZThn20_N14CPhoneAlertingD1Ev @ 186 NONAME
+	_ZThn20_N14CPhoneIncomingD0Ev @ 187 NONAME
+	_ZThn20_N14CPhoneIncomingD1Ev @ 188 NONAME
+	_ZThn20_N15CPhoneCallSetupD0Ev @ 189 NONAME
+	_ZThn20_N15CPhoneCallSetupD1Ev @ 190 NONAME
+	_ZThn20_N15CPhoneEmergency20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 191 NONAME
+	_ZThn20_N16CPhoneSingleCallD0Ev @ 192 NONAME
+	_ZThn20_N16CPhoneSingleCallD1Ev @ 193 NONAME
+	_ZThn20_N16CPhoneTwoSinglesD0Ev @ 194 NONAME
+	_ZThn20_N16CPhoneTwoSinglesD1Ev @ 195 NONAME
+	_ZThn24_N10CPhoneIdleD0Ev @ 196 NONAME
+	_ZThn24_N10CPhoneIdleD1Ev @ 197 NONAME
+	_ZThn24_N14CPhoneAlertingD0Ev @ 198 NONAME
+	_ZThn24_N14CPhoneAlertingD1Ev @ 199 NONAME
+	_ZThn24_N14CPhoneIncomingD0Ev @ 200 NONAME
+	_ZThn24_N14CPhoneIncomingD1Ev @ 201 NONAME
+	_ZThn24_N15CPhoneCallSetupD0Ev @ 202 NONAME
+	_ZThn24_N15CPhoneCallSetupD1Ev @ 203 NONAME
+	_ZThn24_N15CPhoneGsmInCall19SetDivertIndicationEi @ 204 NONAME
+	_ZThn24_N16CPhoneSingleCallD0Ev @ 205 NONAME
+	_ZThn24_N16CPhoneSingleCallD1Ev @ 206 NONAME
+	_ZThn24_N16CPhoneTwoSinglesD0Ev @ 207 NONAME
+	_ZThn24_N16CPhoneTwoSinglesD1Ev @ 208 NONAME
+	_ZThn28_N16CPhoneTwoSingles25HandleNumberEntryClearedLEv @ 209 NONAME
+	_ZThn32_N10CPhoneIdleD0Ev @ 210 NONAME
+	_ZThn32_N10CPhoneIdleD1Ev @ 211 NONAME
+	_ZThn32_N14CPhoneAlertingD0Ev @ 212 NONAME
+	_ZThn32_N14CPhoneAlertingD1Ev @ 213 NONAME
+	_ZThn32_N14CPhoneIncomingD0Ev @ 214 NONAME
+	_ZThn32_N14CPhoneIncomingD1Ev @ 215 NONAME
+	_ZThn32_N15CPhoneCallSetupD0Ev @ 216 NONAME
+	_ZThn32_N15CPhoneCallSetupD1Ev @ 217 NONAME
+	_ZThn32_N16CPhoneSingleCallD0Ev @ 218 NONAME
+	_ZThn32_N16CPhoneSingleCallD1Ev @ 219 NONAME
+	_ZThn32_N16CPhoneTwoSinglesD0Ev @ 220 NONAME
+	_ZThn32_N16CPhoneTwoSinglesD1Ev @ 221 NONAME
+	_ZThn4_N10CPhoneIdle12HandleErrorLERK12TPEErrorInfo @ 222 NONAME
+	_ZThn4_N10CPhoneIdle25HandlePhoneEngineMessageLEii @ 223 NONAME
+	_ZThn4_N10CPhoneIdleD0Ev @ 224 NONAME
+	_ZThn4_N10CPhoneIdleD1Ev @ 225 NONAME
+	_ZThn4_N14CPhoneAlerting25HandlePhoneEngineMessageLEii @ 226 NONAME
+	_ZThn4_N14CPhoneAlertingD0Ev @ 227 NONAME
+	_ZThn4_N14CPhoneAlertingD1Ev @ 228 NONAME
+	_ZThn4_N14CPhoneIncoming12HandleErrorLERK12TPEErrorInfo @ 229 NONAME
+	_ZThn4_N14CPhoneIncoming25HandlePhoneEngineMessageLEii @ 230 NONAME
+	_ZThn4_N14CPhoneIncomingD0Ev @ 231 NONAME
+	_ZThn4_N14CPhoneIncomingD1Ev @ 232 NONAME
+	_ZThn4_N15CPhoneCallSetup25HandlePhoneEngineMessageLEii @ 233 NONAME
+	_ZThn4_N15CPhoneCallSetupD0Ev @ 234 NONAME
+	_ZThn4_N15CPhoneCallSetupD1Ev @ 235 NONAME
+	_ZThn4_N16CPhoneSingleCall25HandlePhoneEngineMessageLEii @ 236 NONAME
+	_ZThn4_N16CPhoneSingleCallD0Ev @ 237 NONAME
+	_ZThn4_N16CPhoneSingleCallD1Ev @ 238 NONAME
+	_ZThn4_N16CPhoneTwoSingles25HandlePhoneEngineMessageLEii @ 239 NONAME
+	_ZThn4_N16CPhoneTwoSinglesD0Ev @ 240 NONAME
+	_ZThn4_N16CPhoneTwoSinglesD1Ev @ 241 NONAME
+	_ZThn4_N21CPhoneStateMachineGSM18CreatePhoneEngineLER14MEngineMonitor @ 242 NONAME
+	_ZThn4_N21CPhoneStateMachineGSM5StateEv @ 243 NONAME
+	_ZThn4_N21CPhoneStateMachineGSMD0Ev @ 244 NONAME
+	_ZThn4_N21CPhoneStateMachineGSMD1Ev @ 245 NONAME
+	_ZThn4_N22CPhoneSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 246 NONAME
+	_ZThn4_N22CPhoneStartupSimlockUi25HandlePhoneEngineMessageLEii @ 247 NONAME
+	_ZThn4_N25CPhoneCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 248 NONAME
+	_ZThn4_N25CPhoneResourceResolverGSMD0Ev @ 249 NONAME
+	_ZThn4_N25CPhoneResourceResolverGSMD1Ev @ 250 NONAME
+	_ZThn4_N26CPhoneConferenceAndWaiting12HandleErrorLERK12TPEErrorInfo @ 251 NONAME
+	_ZThn4_N26CPhoneErrorMessagesHandler22ShowErrorSpecificNoteLERK12TPEErrorInfo @ 252 NONAME
+	_ZThn4_N26CPhoneErrorMessagesHandlerD0Ev @ 253 NONAME
+	_ZThn4_N26CPhoneErrorMessagesHandlerD1Ev @ 254 NONAME
+	_ZThn4_N26CPhoneTwoSinglesAndWaiting12HandleErrorLERK12TPEErrorInfo @ 255 NONAME
+	_ZThn4_N34CPhoneSingleAndCallSetupAndWaiting12HandleErrorLERK12TPEErrorInfo @ 256 NONAME
+	_ZThn4_N35CPhoneConferenceAndSingleAndWaiting12HandleErrorLERK12TPEErrorInfo @ 257 NONAME
+	_ZThn4_N38CPhoneConferenceAndWaitingAndCallSetup12HandleErrorLERK12TPEErrorInfo @ 258 NONAME
+	_ZThn4_NK25CPhoneResourceResolverGSM17ResolveResourceIDERKi @ 259 NONAME
+	_ZThn8_N10CPhoneIdleD0Ev @ 260 NONAME
+	_ZThn8_N10CPhoneIdleD1Ev @ 261 NONAME
+	_ZThn8_N14CPhoneAlerting17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 262 NONAME
+	_ZThn8_N14CPhoneAlertingD0Ev @ 263 NONAME
+	_ZThn8_N14CPhoneAlertingD1Ev @ 264 NONAME
+	_ZThn8_N14CPhoneIncomingD0Ev @ 265 NONAME
+	_ZThn8_N14CPhoneIncomingD1Ev @ 266 NONAME
+	_ZThn8_N15CPhoneCallSetupD0Ev @ 267 NONAME
+	_ZThn8_N15CPhoneCallSetupD1Ev @ 268 NONAME
+	_ZThn8_N16CPhoneSingleCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 269 NONAME
+	_ZThn8_N16CPhoneSingleCallD0Ev @ 270 NONAME
+	_ZThn8_N16CPhoneSingleCallD1Ev @ 271 NONAME
+	_ZThn8_N16CPhoneTwoSingles17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 272 NONAME
+	_ZThn8_N16CPhoneTwoSinglesD0Ev @ 273 NONAME
+	_ZThn8_N16CPhoneTwoSinglesD1Ev @ 274 NONAME
 
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandsingleandwaiting.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandsingleandwaiting.h	Mon Mar 15 12:40:24 2010 +0200
@@ -62,10 +62,6 @@
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
 
-        virtual void HandleKeyEventL( 
-            const TKeyEvent& aKeyEvent,
-            TEventCode aEventCode );
-        
         /**
         * HandleError
         * Implements error handling framework
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h	Mon Mar 15 12:40:24 2010 +0200
@@ -62,10 +62,6 @@
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
      
-        virtual void HandleKeyEventL(
-            const TKeyEvent& aKeyEvent,
-            TEventCode aEventCode );
-        
         /**
         * HandleError
         * Implements error handling framework
--- a/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h	Mon Mar 15 12:40:24 2010 +0200
@@ -96,10 +96,6 @@
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
 
-        virtual void HandleKeyEventL( 
-            const TKeyEvent& aKeyEvent,
-            TEventCode aEventCode );
-        
         /**
         * Opens menu bar.
         */    
--- a/phoneapp/phoneuistates/inc/cphonestartupsimlockui.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/inc/cphonestartupsimlockui.h	Mon Mar 15 12:40:24 2010 +0200
@@ -55,6 +55,17 @@
          const TInt aMessage, 
          TInt aCallId );       
 
+
+    // From MPhonePubSubObserver
+    /**
+     * This function is called when there is property value change.
+     * @param aCategory Category of the property
+     * @param aKey Property key that is changed
+     * @param aValue New property value
+     */
+    IMPORT_C virtual void HandlePropertyChangedL( const TUid& aCategory,
+            const TUint aKey, const TInt aValue );       
+
 private:
 
     /**
@@ -80,16 +91,6 @@
      */
     void ExitSimLockModeL();
 
-    // From MPhonePubSubObserver
-    /**
-     * This function is called when there is property value change.
-     * @param aCategory Category of the property
-     * @param aKey Property key that is changed
-     * @param aValue New property value
-     */
-    IMPORT_C virtual void HandlePropertyChangedL( const TUid& aCategory,
-            const TUint aKey, const TInt aValue );   
-
     /**
      * Handles startup of the phone application 
      */
--- a/phoneapp/phoneuistates/inc/cphonetwosinglesandwaiting.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/inc/cphonetwosinglesandwaiting.h	Mon Mar 15 12:40:24 2010 +0200
@@ -53,10 +53,6 @@
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
 
-        virtual void HandleKeyEventL( 
-            const TKeyEvent& aKeyEvent,
-            TEventCode aEventCode );
-        
         /**
         * A message handling function for Phone Engine messages
         * @param aMessage Message from Phone Engine
--- a/phoneapp/phoneuistates/src/cphoneconference.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconference.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -954,9 +954,6 @@
     // Close fast swap window if it's displayed
     CEikonEnv::Static()->DismissTaskList();
 
-    // Check if HW Keys or Call UI should be disabled
-    CheckDisableHWKeysAndCallUIL();
-    
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
     
     // Display incoming call
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -486,9 +486,6 @@
     // Set touch controls
     SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
 
-    // Check if HW Keys or Call UI should be disabled
-    CheckDisableHWKeysAndCallUIL();
-
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
         
     // Display incoming call
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -32,9 +32,6 @@
 #include "phonerssbase.h"
 #include "tphonecmdparamglobalnote.h"
 #include "phoneui.hrh"
-#include "mphonestorage.h"
-#include "cphonecenrepproxy.h"
-#include <telephonyvariant.hrh>
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -296,9 +293,6 @@
     SetTouchPaneButtons( EPhoneWaitingCallButtons ); 
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
     
-    // Check if HW Keys or Call UI should be disabled
-    CheckDisableHWKeysAndCallUIL();
-
     // Go to Conference And Waiting state
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
     iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting );
@@ -313,15 +307,6 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndSingleAndWaiting::MakeStateTransitionToConferenceAndSingleL()");
 
-    if( /*FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
-        */ 1 &&  iStateMachine->PhoneStorage()->IsScreenLocked() )
-        {
-        EnableCallUIL();
-        }
-    
-    // Reset blocked keys list
-    iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-    
     if ( !IsNumberEntryUsedL() )
         {
         // Close menu bar, if number entry isnt open.
@@ -423,22 +408,6 @@
     }
 
 // -----------------------------------------------------------
-// CPhoneConferenceAndSingleAndWaiting::HandleKeyEventL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndSingleAndWaiting::HandleKeyEventL(
-    const TKeyEvent& aKeyEvent,
-    TEventCode aEventCode )
-    {
-    if( EKeyDeviceF == aKeyEvent.iCode )
-        {
-        __PHONELOG( EBasic, EPhoneUIStates,
-            "CPhoneConferenceAndSingleAndWaiting::HandleKeyMessageL-deviceF" );
-        HandleHoldSwitchL();
-        }
-    }
-
-// -----------------------------------------------------------
 // CPhoneConferenceAndSingleAndWaiting::HandleErrorL
 // -----------------------------------------------------------
 //
@@ -509,9 +478,6 @@
                 // Go to Incoming state
                 iCbaManager->UpdateIncomingCbaL( callStateData.CallId() );
 
-                // Check if HW Keys or Call UI should be disabled
-                CheckDisableHWKeysAndCallUIL();
-                
                 SetTouchPaneButtons( EPhoneIncomingCallButtons );
                 UpdateSilenceButtonDimming();
                 SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
@@ -534,9 +500,6 @@
             SetTouchPaneButtons( EPhoneWaitingCallButtons );        
             SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
 
-            // Check if HW Keys or Call UI should be disabled
-            CheckDisableHWKeysAndCallUIL();
-
             iStateMachine->ChangeState( EPhoneStateWaitingInSingle );        
             }
             break;
@@ -545,9 +508,6 @@
             // Go to Two Singles And Waiting state
             UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
 
-            // Check if HW Keys or Call UI should be disabled
-            CheckDisableHWKeysAndCallUIL();
-
             SetTouchPaneButtons( EPhoneWaitingCallButtons );        
             iStateMachine->ChangeState( EPhoneStateTwoSinglesAndWaiting );
             }
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -19,8 +19,6 @@
 // INCLUDES
 #include <StringLoader.h>
 #include <cpephonemodelif.h>
-#include <featmgr.h>
-#include <telephonyvariant.hrh>
 #include "cphoneconferenceandwaiting.h"
 #include "mphonestatemachine.h"
 #include "phoneviewcommanddefinitions.h"
@@ -34,8 +32,6 @@
 #include "phonerssbase.h"
 #include "tphonecmdparamglobalnote.h"
 #include "phoneui.hrh"
-#include "cphonecenrepproxy.h"
-#include "mphonestorage.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -171,22 +167,6 @@
     }
 
 // -----------------------------------------------------------
-// CPhoneConferenceAndWaiting::HandleKeyEventL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndWaiting::HandleKeyEventL(
-    const TKeyEvent& aKeyEvent,
-    TEventCode aEventCode )
-    {
-    if( EKeyDeviceF == aKeyEvent.iCode )
-        {
-        __PHONELOG( EBasic, EPhoneUIStates,
-            "CPhoneConferenceAndWaiting::HandleKeyMessageL-deviceF" );
-        HandleHoldSwitchL();
-        }
-    }
-
-// -----------------------------------------------------------
 // CPhoneConferenceAndWaiting::HandleErrorL
 // -----------------------------------------------------------
 //
@@ -286,15 +266,6 @@
     {
     __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()");
     
-    if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
-        && iStateMachine->PhoneStorage()->IsScreenLocked() )
-        {
-        EnableCallUIL();
-        }
-    
-    // Reset blocked keys list
-    iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-    
     // Effect is shown when dialer exist.
     TBool effectStarted ( EFalse );
     if ( !NeedToReturnToForegroundAppL() )
@@ -405,15 +376,6 @@
                 }
             }
         
-        if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
-            && iStateMachine->PhoneStorage()->IsScreenLocked() )
-            {
-            EnableCallUIL();
-            }
-        
-        // Reset blocked keys list
-        iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-
         if ( iViewCommandHandle->HandleCommandL( EPhoneViewIsConferenceInExpandedMode ) 
                 == EPhoneViewResponseSuccess )
             {
@@ -499,9 +461,6 @@
                 SetNumberEntryVisibilityL(EFalse);   
                 }
             
-            // Check if HW Keys or Call UI should be disabled
-            CheckDisableHWKeysAndCallUIL();
-            
             SetTouchPaneButtons( EPhoneIncomingCallButtons );
             SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
             SetRingingTonePlaybackL( iRingingCallId );          
@@ -519,9 +478,6 @@
             // Go to waiting in single state
             UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
             
-            // Check if HW Keys or Call UI should be disabled
-            CheckDisableHWKeysAndCallUIL();
-            
             SetTouchPaneButtons( EPhoneWaitingCallButtons );             
             iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
             break;
@@ -535,9 +491,6 @@
             // Go to two singles and waiting state
             UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
             
-            // Check if HW Keys or Call UI should be disabled
-            CheckDisableHWKeysAndCallUIL();
-            
             SetTouchPaneButtons( EPhoneWaitingCallButtons );               
 
             iStateMachine->ChangeState( EPhoneStateTwoSinglesAndWaiting );
--- a/phoneapp/phoneuistates/src/cphoneincoming.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneincoming.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -18,7 +18,6 @@
 
 // INCLUDES
 #include <featmgr.h>
-#include <telephonyvariant.hrh>
 #include "cphoneincoming.h"
 #include "phonerssbase.h"
 #include "phonelogger.h"
@@ -28,8 +27,6 @@
 #include "tphonecmdparamboolean.h"
 #include "phoneui.hrh"
 #include "mphonestatemachine.h"
-#include "mphonestorage.h"
-#include "cphonecenrepproxy.h"
 #include "tphonecmdparamcallstatedata.h"
 
 // ================= MEMBER FUNCTIONS =======================
@@ -228,29 +225,6 @@
     // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam );
 
-    if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
-            && !CPhoneCenRepProxy::Instance()->
-            IsTelephonyFeatureSupported( KTelephonyLVFlagAllowUnlockOnIncoming ) 
-            && ( IsKeyLockOn() || IsAutoLockOn() ) )
-        {
-        DisableCallUIL();
-        }
-    else
-        {
-        // if keys have been locked, disable keylock without information note
-        if ( IsKeyLockOn() )
-            {
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewDisableKeyLockWithoutNote );
-            }
-        }
-    
-    if( CPhoneCenRepProxy::Instance()->
-            IsTelephonyFeatureSupported( KTelephonyLVFlagDisableCallControlHardKeysWhileLocked ) 
-            && ( IsKeyLockOn() || IsAutoLockOn() ) )
-        {
-        DisableHWKeysL();
-        }
-    
     EndUiUpdate();
 
     if ( connectedCall > KErrNotFound )
@@ -277,6 +251,12 @@
 
     // Remove any phone dialogs if they are displayed
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
+
+    // if keys have been locked, disable keylock without information note
+    if ( IsKeyLockOn() )
+        {
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewDisableKeyLockWithoutNote );
+        }
     
     // Indicate that the Phone needs to be sent to the background if
     // an application other than the top application is in the foreground
--- a/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -42,7 +42,6 @@
 #include "phonelogger.h"
 #include "cphonecenrepproxy.h"
 #include "cphonepubsubproxy.h"
-#include "mphonestorage.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -328,22 +327,6 @@
     }
 
 // -----------------------------------------------------------
-// CPhoneSingleAndWaiting::HandleKeyEventL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndWaiting::HandleKeyEventL(
-    const TKeyEvent& aKeyEvent,
-    TEventCode aEventCode )
-    {
-    if( EKeyDeviceF == aKeyEvent.iCode )
-        {
-        __PHONELOG( EBasic, EPhoneUIStates,
-            "CPhoneSingleAndWaiting::HandleKeyMessageL-deviceF" );
-        HandleHoldSwitchL();
-        }
-    }
-
-// -----------------------------------------------------------
 // CPhoneSingleAndWaiting::HandleIdleL
 // -----------------------------------------------------------
 //
@@ -427,9 +410,6 @@
                 SetNumberEntryVisibilityL(EFalse);
                 }
 
-            // Check if HW Keys or Call UI should be disabled
-            CheckDisableHWKeysAndCallUIL();
-            
             SetTouchPaneButtons( EPhoneIncomingCallButtons );
             SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
             
@@ -493,16 +473,6 @@
                 }
             }
         
-        // Enable call UI
-        if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
-            && iStateMachine->PhoneStorage()->IsScreenLocked() )
-            {
-            EnableCallUIL();
-            }
-
-        // Reset blocked keys list
-        iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-
         SetTouchPaneButtons( EPhoneIncallButtons );
         EndUiUpdate();
         if( effectStarted )
@@ -628,9 +598,6 @@
         effectStarted = ETrue;
         }
     
-    // Reset blocked keys list
-    iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-    
     BeginUiUpdateLC();
 
     UpdateRemoteInfoDataL ( aCallId );
--- a/phoneapp/phoneuistates/src/cphonesinglecall.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonesinglecall.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -27,7 +27,6 @@
 #include <connect/sbdefs.h>
 #include <videotelcontrolmediatorapi.h>
 #include <MediatorDomainUIDs.h>
-#include <telephonyvariant.hrh>
 
 #include "cphonesinglecall.h"
 #include "tphonecmdparamstring.h"
@@ -47,8 +46,6 @@
 #include "cphonemediatorfactory.h"
 #include "cphonemediatorsender.h"
 #include "cphoneswitchtovideoorvoicecommand.h"
-#include "mphonestorage.h"
-#include "cphonecenrepproxy.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -520,29 +517,6 @@
     // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam );
 
-    if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
-            && !CPhoneCenRepProxy::Instance()->
-            IsTelephonyFeatureSupported( KTelephonyLVFlagAllowUnlockOnIncoming ) 
-            && ( IsKeyLockOn() || IsAutoLockOn() ) )
-        {
-        DisableCallUIL();
-        }
-    else
-        {
-        // if keys have been locked, disable keylock without information note
-        if ( IsKeyLockOn() )
-            {
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewDisableKeyLockWithoutNote );
-            }
-        }
-    
-    if( CPhoneCenRepProxy::Instance()->
-            IsTelephonyFeatureSupported( KTelephonyLVFlagDisableCallControlHardKeysWhileLocked ) 
-            && ( IsKeyLockOn() || IsAutoLockOn() ) )
-        {
-        DisableHWKeysL();
-        }
-    
     EndUiUpdate();
 
     // This query is required to dismiss
@@ -572,6 +546,12 @@
 
     // Remove any phone dialogs if they are displayed
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
+
+    // if keys have been locked, disable keylock without information note
+    if ( IsKeyLockOn() )
+        {
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewDisableKeyLockWithoutNote );
+        }
     
     // Indicate that the Phone needs to be sent to the background if
     // an application other than the top application is in the foreground
--- a/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -412,9 +412,6 @@
     // Set touch controls
     SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
     
-    // Check if HW Keys or Call UI should be disabled
-    CheckDisableHWKeysAndCallUIL();
-    
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
 
     EndUiUpdate();
--- a/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -36,7 +36,6 @@
 #include "phonerssbase.h"
 #include "phonestatedefinitionsgsm.h"
 #include "phonelogger.h"
-#include "mphonestorage.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -136,22 +135,6 @@
     }
 
 // -----------------------------------------------------------
-// CPhoneTwoSinglesAndWaiting::HandleKeyEventL
-// -----------------------------------------------------------
-//
-void CPhoneTwoSinglesAndWaiting::HandleKeyEventL(
-    const TKeyEvent& aKeyEvent,
-    TEventCode aEventCode )
-    {
-    if( EKeyDeviceF == aKeyEvent.iCode )
-        {
-        __PHONELOG( EBasic, EPhoneUIStates,
-            "CPhoneTwoSinglesAndWaiting::HandleKeyMessageL-deviceF" );
-        HandleHoldSwitchL();
-        }
-    }
-
-// -----------------------------------------------------------
 // CPhoneTwoSinglesAndWaiting::HandlePhoneEngineMessageL
 // -----------------------------------------------------------
 //
@@ -311,15 +294,6 @@
             }
         }
 
-    if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) 
-        && iStateMachine->PhoneStorage()->IsScreenLocked() )
-        {
-        EnableCallUIL();
-        }
-    
-    // Reset blocked keys list
-    iStateMachine->PhoneStorage()->ResetBlockedKeysList();
-
     // Go to two singles state
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
     SetTouchPaneButtons( EPhoneTwoSinglesButtons );
@@ -341,9 +315,6 @@
     // Set touch controls
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
     
-    // Check if HW Keys or Call UI should be disabled
-    CheckDisableHWKeysAndCallUIL();
-    
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
   
     iStateMachine->ChangeState( EPhoneStateWaitingInSingle );                             
@@ -386,9 +357,6 @@
     // Set touch controls
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
 
-    // Check if HW Keys or Call UI should be disabled
-    CheckDisableHWKeysAndCallUIL();
-    
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewCreateConference, aCallId,
--- a/phoneapp/phoneuiutils/bwins/phoneuiutilsu.def	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiutils/bwins/phoneuiutilsu.def	Mon Mar 15 12:40:24 2010 +0200
@@ -36,302 +36,292 @@
 	??1CPhoneMethodLogger@@UAE@XZ @ 35 NONAME ; CPhoneMethodLogger::~CPhoneMethodLogger(void)
 	?WaitForReady@TPhoneCmdParamGlobalNote@@QBEHXZ @ 36 NONAME ; int TPhoneCmdParamGlobalNote::WaitForReady(void) const
 	?MaskBitmap@TPhoneCmdParamBitmap@@QBEPAVCFbsBitmap@@XZ @ 37 NONAME ; class CFbsBitmap * TPhoneCmdParamBitmap::MaskBitmap(void) const
-	?IsScreenLocked@CPhoneStorage@@UAEHXZ @ 38 NONAME ; int CPhoneStorage::IsScreenLocked(void)
-	?SetText@TPhoneCmdParamGlobalNote@@QAEXABVTDesC16@@@Z @ 39 NONAME ; void TPhoneCmdParamGlobalNote::SetText(class TDesC16 const &)
-	?AddLibraryL@CPhoneLibraryContainer@@QAEXABVRLibrary@@@Z @ 40 NONAME ; void CPhoneLibraryContainer::AddLibraryL(class RLibrary const &)
-	??1CPhoneResourceResolverBase@@UAE@XZ @ 41 NONAME ; CPhoneResourceResolverBase::~CPhoneResourceResolverBase(void)
-	?ResetBlockedKeysList@CPhoneStorage@@UAEXXZ @ 42 NONAME ; void CPhoneStorage::ResetBlockedKeysList(void)
-	?SetInt@CPhoneCenRepProxy@@QAEHABVTUid@@IH@Z @ 43 NONAME ; int CPhoneCenRepProxy::SetInt(class TUid const &, unsigned int, int)
-	?GetCustomCommandForTimeOut@TPhoneCmdParamQuery@@QBEHAAH@Z @ 44 NONAME ; int TPhoneCmdParamQuery::GetCustomCommandForTimeOut(int &) const
-	?ParamId@TPhoneCommandParam@@QBE?AW4TPhoneParamId@1@XZ @ 45 NONAME ; enum TPhoneCommandParam::TPhoneParamId TPhoneCommandParam::ParamId(void) const
-	?SetString@CPhoneCenRepProxy@@QAEHABVTUid@@IABVTDesC16@@@Z @ 46 NONAME ; int CPhoneCenRepProxy::SetString(class TUid const &, unsigned int, class TDesC16 const &)
-	?Line2@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 47 NONAME ; int TPhoneCmdParamCallHeaderData::Line2(void) const
-	??1CPhoneTimer@@UAE@XZ @ 48 NONAME ; CPhoneTimer::~CPhoneTimer(void)
-	?LogMsgFromPEToPhoneUIEnd@CPhoneLogger@@QAEXH@Z @ 49 NONAME ; void CPhoneLogger::LogMsgFromPEToPhoneUIEnd(int)
-	?DialerController@TPhoneCmdParamCustomDialer@@QAEPAVMPhoneDialerController@@XZ @ 50 NONAME ; class MPhoneDialerController * TPhoneCmdParamCustomDialer::DialerController(void)
-	?Type@TPhoneCmdParamGlobalNote@@QBE?AW4TAknGlobalNoteType@@XZ @ 51 NONAME ; enum TAknGlobalNoteType TPhoneCmdParamGlobalNote::Type(void) const
-	?SetMultipleInstances@TPhoneCmdParamAppInfo@@QAEXH@Z @ 52 NONAME ; void TPhoneCmdParamAppInfo::SetMultipleInstances(int)
-	?Tone@TPhoneCmdParamGlobalNote@@QBEHXZ @ 53 NONAME ; int TPhoneCmdParamGlobalNote::Tone(void) const
-	?ChangePropertyValue@CPhonePubSubProxy@@QAEXABVTUid@@IH@Z @ 54 NONAME ; void CPhonePubSubProxy::ChangePropertyValue(class TUid const &, unsigned int, int)
-	?SetThumbnail@TPhoneCmdParamCallHeaderData@@QAEXPAVCFbsBitmap@@@Z @ 55 NONAME ; void TPhoneCmdParamCallHeaderData::SetThumbnail(class CFbsBitmap *)
-	?SetCbaCommandMapping@TPhoneCmdParamQuery@@QAEXHH@Z @ 56 NONAME ; void TPhoneCmdParamQuery::SetCbaCommandMapping(int, int)
-	?EventCode@TPhoneCmdParamKeyEvent@@QBE?AW4TEventCode@@XZ @ 57 NONAME ; enum TEventCode TPhoneCmdParamKeyEvent::EventCode(void) const
-	?KeyEvent@TPhoneCmdParamKeyEvent@@QBE?BUTKeyEvent@@XZ @ 58 NONAME ; struct TKeyEvent const TPhoneCmdParamKeyEvent::KeyEvent(void) const
-	?SetDataText@TPhoneCmdParamQuery@@QAEXPAVTDes16@@@Z @ 59 NONAME ; void TPhoneCmdParamQuery::SetDataText(class TDes16 *)
-	??0TPhoneCmdParamAppInfo@@QAE@XZ @ 60 NONAME ; TPhoneCmdParamAppInfo::TPhoneCmdParamAppInfo(void)
-	?LittleBubbleVisible@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 61 NONAME ; int TPhoneCmdParamIncallIndicatorData::LittleBubbleVisible(void) const
-	?SetCallState@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 62 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCallState(int)
-	?GetString@CPhoneCenRepProxy@@QBEHABVTUid@@IAAVTDes16@@@Z @ 63 NONAME ; int CPhoneCenRepProxy::GetString(class TUid const &, unsigned int, class TDes16 &) const
-	?ResourceId@TPhoneCmdParamProgressNote@@QBEHXZ @ 64 NONAME ; int TPhoneCmdParamProgressNote::ResourceId(void) const
-	?ReconnectQueryObserver@TPhoneCmdParamReconnectQuery@@QBEAAVMCaUiReconnectQueryObserver@@XZ @ 65 NONAME ; class MCaUiReconnectQueryObserver & TPhoneCmdParamReconnectQuery::ReconnectQueryObserver(void) const
-	?CallId@TPhoneCmdParamCallStateData@@QBEHXZ @ 66 NONAME ; int TPhoneCmdParamCallStateData::CallId(void) const
-	?SetContactMatcher@TPhoneCmdParamReconnectQuery@@QAEXPAVCPhCntMatcher@@@Z @ 67 NONAME ; void TPhoneCmdParamReconnectQuery::SetContactMatcher(class CPhCntMatcher *)
-	?NotifyChangeL@CPhoneCenRepProxy@@QAEXABVTUid@@IPAVMPhoneCenRepObserver@@@Z @ 68 NONAME ; void CPhoneCenRepProxy::NotifyChangeL(class TUid const &, unsigned int, class MPhoneCenRepObserver *)
-	?SetResourceId@TPhoneCmdParamDynMenu@@QAEXH@Z @ 69 NONAME ; void TPhoneCmdParamDynMenu::SetResourceId(int)
-	?Validate@CPhoneKeys@@SAHABVTDesC16@@@Z @ 70 NONAME ; int CPhoneKeys::Validate(class TDesC16 const &)
-	??0TPhoneCmdParamKeyCapture@@QAE@XZ @ 71 NONAME ; TPhoneCmdParamKeyCapture::TPhoneCmdParamKeyCapture(void)
-	?SetResourceId@TPhoneCmdParamNote@@QAEXH@Z @ 72 NONAME ; void TPhoneCmdParamNote::SetResourceId(int)
-	?LogMsgFromPEToPhoneUI@CPhoneLogger@@QAEXHH@Z @ 73 NONAME ; void CPhoneLogger::LogMsgFromPEToPhoneUI(int, int)
-	??0TPhoneCmdParamProgressNote@@QAE@XZ @ 74 NONAME ; TPhoneCmdParamProgressNote::TPhoneCmdParamProgressNote(void)
-	?CallState@TPhoneCmdParamCallStateData@@QBEHXZ @ 75 NONAME ; int TPhoneCmdParamCallStateData::CallState(void) const
-	?SetPointer@TPhoneCmdParamPointer@@QAEXPAX@Z @ 76 NONAME ; void TPhoneCmdParamPointer::SetPointer(void *)
-	??1CPhoneCenRepProxy@@UAE@XZ @ 77 NONAME ; CPhoneCenRepProxy::~CPhoneCenRepProxy(void)
-	?SetEventCode@TPhoneCmdParamKeyEvent@@QAEXW4TEventCode@@@Z @ 78 NONAME ; void TPhoneCmdParamKeyEvent::SetEventCode(enum TEventCode)
-	?WaitTime@TPhoneCmdParamProgressNote@@QBE?AVTTimeIntervalMicroSeconds32@@XZ @ 79 NONAME ; class TTimeIntervalMicroSeconds32 TPhoneCmdParamProgressNote::WaitTime(void) const
-	?SetParam@TPhoneCmdParamAppInfo@@QAEXABVTDesC8@@@Z @ 80 NONAME ; void TPhoneCmdParamAppInfo::SetParam(class TDesC8 const &)
-	?CallType@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 81 NONAME ; int TPhoneCmdParamCallHeaderData::CallType(void) const
-	??0TPhoneCmdParamPointer@@QAE@XZ @ 82 NONAME ; TPhoneCmdParamPointer::TPhoneCmdParamPointer(void)
-	??0TPhoneCmdParamGlobalNote@@QAE@XZ @ 83 NONAME ; TPhoneCmdParamGlobalNote::TPhoneCmdParamGlobalNote(void)
-	?SetCiphering@TPhoneCmdParamEmergencyCallHeaderData@@QAEXH@Z @ 84 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetCiphering(int)
-	?SetTone@TPhoneCmdParamNote@@QAEXW4TTone@CAknNoteDialog@@@Z @ 85 NONAME ; void TPhoneCmdParamNote::SetTone(enum CAknNoteDialog::TTone)
-	?SetCustomCommandForTimeOut@TPhoneCmdParamQuery@@QAEXH@Z @ 86 NONAME ; void TPhoneCmdParamQuery::SetCustomCommandForTimeOut(int)
-	?SetIncludeVideoOption@TPhoneCmdParamReconnectQuery@@QAEXH@Z @ 87 NONAME ; void TPhoneCmdParamReconnectQuery::SetIncludeVideoOption(int)
-	?IsBTAccAvailable@TPhoneCmdParamAudioAvailability@@QBEHXZ @ 88 NONAME ; int TPhoneCmdParamAudioAvailability::IsBTAccAvailable(void) const
-	?NewL@CPhoneStorage@@SAPAV1@XZ @ 89 NONAME ; class CPhoneStorage * CPhoneStorage::NewL(void)
-	?Timeout@TPhoneCmdParamNote@@QBE?AW4TTimeout@CAknNoteDialog@@XZ @ 90 NONAME ; enum CAknNoteDialog::TTimeout TPhoneCmdParamNote::Timeout(void) const
-	?Instance@CPhoneRecoverySystem@@SAPAV1@XZ @ 91 NONAME ; class CPhoneRecoverySystem * CPhoneRecoverySystem::Instance(void)
-	?CancelTimer@CPhoneTimer@@QAEXXZ @ 92 NONAME ; void CPhoneTimer::CancelTimer(void)
-	?NewL@CPhoneTimer@@SAPAV1@H@Z @ 93 NONAME ; class CPhoneTimer * CPhoneTimer::NewL(int)
-	?GetInt@CPhoneCenRepProxy@@QBEHABVTUid@@IAAH@Z @ 94 NONAME ; int CPhoneCenRepProxy::GetInt(class TUid const &, unsigned int, int &) const
-	?SetTextToSay@TPhoneCmdParamRingTone@@QAEXABVTDesC16@@@Z @ 95 NONAME ; void TPhoneCmdParamRingTone::SetTextToSay(class TDesC16 const &)
-	?SetCallState@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 96 NONAME ; void TPhoneCmdParamCallHeaderData::SetCallState(int)
-	?ContentCba@TPhoneCmdParamQuery@@QBEHXZ @ 97 NONAME ; int TPhoneCmdParamQuery::ContentCba(void) const
-	?SetTextResourceId@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 98 NONAME ; void TPhoneCmdParamGlobalNote::SetTextResourceId(int)
-	??0TPhoneCmdParamDynMenu@@QAE@XZ @ 99 NONAME ; TPhoneCmdParamDynMenu::TPhoneCmdParamDynMenu(void)
-	?CancelAllNotifications@CPhonePubSubProxy@@SAXPAVMPhonePubSubObserver@@@Z @ 100 NONAME ; void CPhonePubSubProxy::CancelAllNotifications(class MPhonePubSubObserver *)
-	??0TPhoneCommandParam@@QAE@XZ @ 101 NONAME ; TPhoneCommandParam::TPhoneCommandParam(void)
-	?SetCNAPText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@W4TPhoneClippingDirection@CBubbleManager@@@Z @ 102 NONAME ; void TPhoneCmdParamCallHeaderData::SetCNAPText(class TDesC16 const &, enum CBubbleManager::TPhoneClippingDirection)
-	??1CPhoneLogger@@UAE@XZ @ 103 NONAME ; CPhoneLogger::~CPhoneLogger(void)
-	?Softkeys@TPhoneCmdParamGlobalNote@@QBEHXZ @ 104 NONAME ; int TPhoneCmdParamGlobalNote::Softkeys(void) const
-	??0TPhoneCmdParamMessageEditor@@QAE@XZ @ 105 NONAME ; TPhoneCmdParamMessageEditor::TPhoneCmdParamMessageEditor(void)
-	?SetCallState@TPhoneCmdParamCallStateData@@QAEXH@Z @ 106 NONAME ; void TPhoneCmdParamCallStateData::SetCallState(int)
-	?CallerText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 107 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::CallerText(void) const
-	?String@TPhoneCmdParamString@@QAEPAVTPtr16@@XZ @ 108 NONAME ; class TPtr16 * TPhoneCmdParamString::String(void)
-	?SetKey@TPhoneCmdParamKeyCapture@@QAEXW4TStdScanCode@@@Z @ 109 NONAME ; void TPhoneCmdParamKeyCapture::SetKey(enum TStdScanCode)
-	?IsExtraChar@CPhoneKeys@@SAHH@Z @ 110 NONAME ; int CPhoneKeys::IsExtraChar(int)
-	?SetDynMenu@TPhoneCmdParamDynMenu@@QAEXPAX@Z @ 111 NONAME ; void TPhoneCmdParamDynMenu::SetDynMenu(void *)
-	?IsSecondHashKey@CPhoneKeys@@SAHABVTDes16@@@Z @ 112 NONAME ; int CPhoneKeys::IsSecondHashKey(class TDes16 const &)
-	?SetCallerImageStatus@TPhoneCmdParamRingTone@@QAEXH@Z @ 113 NONAME ; void TPhoneCmdParamRingTone::SetCallerImageStatus(int)
-	?GetReal@CPhoneCenRepProxy@@QBEHABVTUid@@IAAN@Z @ 114 NONAME ; int CPhoneCenRepProxy::GetReal(class TUid const &, unsigned int, double &) const
-	?SetShortLabelText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 115 NONAME ; void TPhoneCmdParamCallHeaderData::SetShortLabelText(class TDesC16 const &)
-	?SetDialerController@TPhoneCmdParamCustomDialer@@QAEXPAVMPhoneDialerController@@@Z @ 116 NONAME ; void TPhoneCmdParamCustomDialer::SetDialerController(class MPhoneDialerController *)
-	?RingTone@TPhoneCmdParamRingTone@@QBEABVTDesC16@@XZ @ 117 NONAME ; class TDesC16 const & TPhoneCmdParamRingTone::RingTone(void) const
-	?TimeOut@TPhoneCmdParamQuery@@QBEHXZ @ 118 NONAME ; int TPhoneCmdParamQuery::TimeOut(void) const
-	?ShortLabelText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 119 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::ShortLabelText(void) const
-	?SetInteger@TPhoneCmdParamInteger@@QAEXH@Z @ 120 NONAME ; void TPhoneCmdParamInteger::SetInteger(int)
-	?SetMaskBitmap@TPhoneCmdParamBitmap@@QAEXPAVCFbsBitmap@@@Z @ 121 NONAME ; void TPhoneCmdParamBitmap::SetMaskBitmap(class CFbsBitmap *)
-	?SetTimeout@TPhoneCmdParamNote@@QAEXW4TTimeout@CAknNoteDialog@@@Z @ 122 NONAME ; void TPhoneCmdParamNote::SetTimeout(enum CAknNoteDialog::TTimeout)
-	?IsBlockedKeysListEmpty@CPhoneStorage@@UAEHXZ @ 123 NONAME ; int CPhoneStorage::IsBlockedKeysListEmpty(void)
-	?SetCustomMessage@TPhoneCmdParamAppInfo@@QAEXABVTDesC8@@@Z @ 124 NONAME ; void TPhoneCmdParamAppInfo::SetCustomMessage(class TDesC8 const &)
-	?BaseConstructL@CPhoneResourceResolverBase@@QAEXXZ @ 125 NONAME ; void CPhoneResourceResolverBase::BaseConstructL(void)
-	?SetTextResourceId@TPhoneCmdParamNote@@QAEXH@Z @ 126 NONAME ; void TPhoneCmdParamNote::SetTextResourceId(int)
-	?SetString@TPhoneCmdParamString@@QAEXPAVTPtr16@@@Z @ 127 NONAME ; void TPhoneCmdParamString::SetString(class TPtr16 *)
-	?SetAppUid@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 128 NONAME ; void TPhoneCmdParamAppInfo::SetAppUid(class TUid const &)
-	?String@TPhoneCmdParamSingleItemFetch@@QBEPAVTDes16@@XZ @ 129 NONAME ; class TDes16 * TPhoneCmdParamSingleItemFetch::String(void) const
-	?SetBTAccAvailable@TPhoneCmdParamAudioAvailability@@QAEXH@Z @ 130 NONAME ; void TPhoneCmdParamAudioAvailability::SetBTAccAvailable(int)
-	?IsTelephonyFeatureSupported@CPhoneCenRepProxy@@QAEHH@Z @ 131 NONAME ; int CPhoneCenRepProxy::IsTelephonyFeatureSupported(int)
-	?CallImageThemeFilePath@CPhoneCallThemeMonitor@@QBE?AVTPtrC16@@XZ @ 132 NONAME ; class TPtrC16 CPhoneCallThemeMonitor::CallImageThemeFilePath(void) const
-	?HasThumbnail@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 133 NONAME ; int TPhoneCmdParamCallHeaderData::HasThumbnail(void) const
-	?ClearBlackListNow@CPhoneClearBlacklist@@QAEXXZ @ 134 NONAME ; void CPhoneClearBlacklist::ClearBlackListNow(void)
-	?SetCipheringIndicatorAllowed@TPhoneCmdParamEmergencyCallHeaderData@@QAEXH@Z @ 135 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetCipheringIndicatorAllowed(int)
-	?SetCommandParamId@TPhoneCmdParamQuery@@QAEXW4TPhoneParamId@TPhoneCommandParam@@@Z @ 136 NONAME ; void TPhoneCmdParamQuery::SetCommandParamId(enum TPhoneCommandParam::TPhoneParamId)
-	??0TPhoneCmdParamEmergencyCallHeaderData@@QAE@XZ @ 137 NONAME ; TPhoneCmdParamEmergencyCallHeaderData::TPhoneCmdParamEmergencyCallHeaderData(void)
-	?After@CPhoneTimer@@QAEXVTTimeIntervalMicroSeconds32@@PAVMPhoneTimer@@@Z @ 138 NONAME ; void CPhoneTimer::After(class TTimeIntervalMicroSeconds32, class MPhoneTimer *)
-	?NewL@CPhoneLibraryContainer@@SAPAV1@XZ @ 139 NONAME ; class CPhoneLibraryContainer * CPhoneLibraryContainer::NewL(void)
-	?CreateL@CPhoneClearBlacklist@@SAPAV1@AAVRWsSession@@ABVRWindowBase@@@Z @ 140 NONAME ; class CPhoneClearBlacklist * CPhoneClearBlacklist::CreateL(class RWsSession &, class RWindowBase const &)
-	??1CPhoneStorage@@UAE@XZ @ 141 NONAME ; CPhoneStorage::~CPhoneStorage(void)
-	?SetVolume@TPhoneCmdParamRingTone@@QAEXH@Z @ 142 NONAME ; void TPhoneCmdParamRingTone::SetVolume(int)
-	??0TPhoneCmdParamString@@QAE@XZ @ 143 NONAME ; TPhoneCmdParamString::TPhoneCmdParamString(void)
-	?SetContactLink@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC8@@@Z @ 144 NONAME ; void TPhoneCmdParamCallHeaderData::SetContactLink(class TDesC8 const &)
-	??4TPhoneCmdParamQuery@@QAEAAV0@ABV0@@Z @ 145 NONAME ; class TPhoneCmdParamQuery & TPhoneCmdParamQuery::operator=(class TPhoneCmdParamQuery const &)
-	??0TPhoneCmdParamAudioAvailability@@QAE@XZ @ 146 NONAME ; TPhoneCmdParamAudioAvailability::TPhoneCmdParamAudioAvailability(void)
-	?GetBlockedKeyList@CPhoneStorage@@UBEABV?$RArray@H@@XZ @ 147 NONAME ; class RArray<int> const & CPhoneStorage::GetBlockedKeyList(void) const
-	??0TPhoneCmdParamRingTone@@QAE@XZ @ 148 NONAME ; TPhoneCmdParamRingTone::TPhoneCmdParamRingTone(void)
-	?Observer@TPhoneCmdParamNumberEntryObserver@@QAE?AVTCallBack@@XZ @ 149 NONAME ; class TCallBack TPhoneCmdParamNumberEntryObserver::Observer(void)
-	?SetSoftkeys@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 150 NONAME ; void TPhoneCmdParamGlobalNote::SetSoftkeys(int)
-	??0CPhoneResourceResolverBase@@IAE@XZ @ 151 NONAME ; CPhoneResourceResolverBase::CPhoneResourceResolverBase(void)
-	?SetCallId@TPhoneCmdParamCallStateData@@QAEXH@Z @ 152 NONAME ; void TPhoneCmdParamCallStateData::SetCallId(int)
-	?MultipleInstances@TPhoneCmdParamAppInfo@@QBEHXZ @ 153 NONAME ; int TPhoneCmdParamAppInfo::MultipleInstances(void) const
-	?ItemTextArrayForListQuery@TPhoneCmdParamQuery@@QBEPAVMDesC16Array@@XZ @ 154 NONAME ; class MDesC16Array * TPhoneCmdParamQuery::ItemTextArrayForListQuery(void) const
-	?SetHeaderText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 155 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetHeaderText(class TDesC16 const &)
-	?SetContentCba@TPhoneCmdParamQuery@@QAEXH@Z @ 156 NONAME ; void TPhoneCmdParamQuery::SetContentCba(int)
-	?CaptureType@TPhoneCmdParamKeyCapture@@QBE?AW4TPhoneCaptureType@@XZ @ 157 NONAME ; enum TPhoneCaptureType TPhoneCmdParamKeyCapture::CaptureType(void) const
-	?SetQueryResourceId@TPhoneCmdParamQuery@@QAEXH@Z @ 158 NONAME ; void TPhoneCmdParamQuery::SetQueryResourceId(int)
-	?CancelNotify@CPhoneCenRepProxy@@QAEXPAVMPhoneCenRepObserver@@I@Z @ 159 NONAME ; void CPhoneCenRepProxy::CancelNotify(class MPhoneCenRepObserver *, unsigned int)
-	?Param@TPhoneCmdParamAppInfo@@QBEABVTDesC8@@XZ @ 160 NONAME ; class TDesC8 const & TPhoneCmdParamAppInfo::Param(void) const
-	??0CPhoneMethodLogger@@QAE@W4TPhoneUILoggingComponent@@VTPtrC16@@@Z @ 161 NONAME ; CPhoneMethodLogger::CPhoneMethodLogger(enum TPhoneUILoggingComponent, class TPtrC16)
-	?IsDtmfTone@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 162 NONAME ; int CPhoneKeys::IsDtmfTone(struct TKeyEvent const &, enum TEventCode)
-	?SetMode@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 163 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetMode(int)
-	?NewL@CPhoneCallThemeMonitor@@SAPAV1@XZ @ 164 NONAME ; class CPhoneCallThemeMonitor * CPhoneCallThemeMonitor::NewL(void)
-	?SetCLIText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@W4TPhoneClippingDirection@CBubbleManager@@@Z @ 165 NONAME ; void TPhoneCmdParamCallHeaderData::SetCLIText(class TDesC16 const &, enum CBubbleManager::TPhoneClippingDirection)
-	?SetPhoneNumber@TPhoneCmdParamSpeedDial@@QAEXPAVTPtr16@@@Z @ 166 NONAME ; void TPhoneCmdParamSpeedDial::SetPhoneNumber(class TPtr16 *)
-	?SendKeyEnabled@TPhoneCmdParamQuery@@QBEHXZ @ 167 NONAME ; int TPhoneCmdParamQuery::SendKeyEnabled(void) const
-	?SetNeedToEnableKeylock@CPhoneStorage@@UAEXH@Z @ 168 NONAME ; void CPhoneStorage::SetNeedToEnableKeylock(int)
-	?SetTitlePaneResourceId@TPhoneCmdParamSingleItemFetch@@QAEXH@Z @ 169 NONAME ; void TPhoneCmdParamSingleItemFetch::SetTitlePaneResourceId(int)
-	?Find@CPhoneCenRepProxy@@QBEHABVTUid@@KKAAV?$RArray@K@@@Z @ 170 NONAME ; int CPhoneCenRepProxy::Find(class TUid const &, unsigned long, unsigned long, class RArray<unsigned long> &) const
-	?SetLabelText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 171 NONAME ; void TPhoneCmdParamCallHeaderData::SetLabelText(class TDesC16 const &)
-	?CNAPText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 172 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::CNAPText(void) const
-	?SetOwnPhoneNumberText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 173 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetOwnPhoneNumberText(class TDesC16 const &)
-	?Emergency@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 174 NONAME ; int TPhoneCmdParamIncallIndicatorData::Emergency(void) const
-	?SetCbaResourceId@TPhoneCmdParamSingleItemFetch@@QAEXH@Z @ 175 NONAME ; void TPhoneCmdParamSingleItemFetch::SetCbaResourceId(int)
-	?AppUid@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 176 NONAME ; class TUid TPhoneCmdParamAppInfo::AppUid(void) const
-	?CustomMessage@TPhoneCmdParamAppInfo@@QBEABVTDesC8@@XZ @ 177 NONAME ; class TDesC8 const & TPhoneCmdParamAppInfo::CustomMessage(void) const
-	?QueryResourceId@TPhoneCmdParamQuery@@QBEHXZ @ 178 NONAME ; int TPhoneCmdParamQuery::QueryResourceId(void) const
-	?SetRingTone@TPhoneCmdParamRingTone@@QAEXABVTDesC16@@@Z @ 179 NONAME ; void TPhoneCmdParamRingTone::SetRingTone(class TDesC16 const &)
-	?NotifyChangeL@CPhonePubSubProxy@@QAEXABVTUid@@IPAVMPhonePubSubObserver@@@Z @ 180 NONAME ; void CPhonePubSubProxy::NotifyChangeL(class TUid const &, unsigned int, class MPhonePubSubObserver *)
-	?AppendBlockedKeysListL@CPhoneStorage@@UAEXW4TStdScanCode@@@Z @ 181 NONAME ; void CPhoneStorage::AppendBlockedKeysListL(enum TStdScanCode)
-	?SetEmergency@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 182 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetEmergency(int)
-	?SetDefaultCba@TPhoneCmdParamQuery@@QAEXH@Z @ 183 NONAME ; void TPhoneCmdParamQuery::SetDefaultCba(int)
-	?Type@TPhoneCmdParamTransEffect@@QBE?AW4TPhoneTransEffectType@@XZ @ 184 NONAME ; enum TPhoneTransEffectType TPhoneCmdParamTransEffect::Type(void) const
-	??0TPhoneCmdParamSfiData@@QAE@XZ @ 185 NONAME ; TPhoneCmdParamSfiData::TPhoneCmdParamSfiData(void)
-	??0TPhoneCmdParamCallHeaderData@@QAE@XZ @ 186 NONAME ; TPhoneCmdParamCallHeaderData::TPhoneCmdParamCallHeaderData(void)
-	??1CPhoneClearBlacklist@@UAE@XZ @ 187 NONAME ; CPhoneClearBlacklist::~CPhoneClearBlacklist(void)
-	?SetMute@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 188 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetMute(int)
-	?KeyCode@TPhoneCmdParamKeyCapture@@QBE?AW4TKeyCode@@XZ @ 189 NONAME ; enum TKeyCode TPhoneCmdParamKeyCapture::KeyCode(void) const
-	?IsNumberKey@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 190 NONAME ; int CPhoneKeys::IsNumberKey(struct TKeyEvent const &, enum TEventCode)
-	?TextResourceId@TPhoneCmdParamGlobalNote@@QBEHXZ @ 191 NONAME ; int TPhoneCmdParamGlobalNote::TextResourceId(void) const
-	?SetCiphering@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 192 NONAME ; void TPhoneCmdParamCallHeaderData::SetCiphering(int)
-	?EnablePreconditionL@CPhoneRecoverySystem@@QAEXXZ @ 193 NONAME ; void CPhoneRecoverySystem::EnablePreconditionL(void)
-	?AddL@CPhoneRecoverySystem@@QAEHVTCallBack@@CW4TRecoveryState@CTeleRecoverySystem@@@Z @ 194 NONAME ; int CPhoneRecoverySystem::AddL(class TCallBack, signed char, enum CTeleRecoverySystem::TRecoveryState)
-	?SetLine2@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 195 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetLine2(int)
-	?SetAudioOutput@TPhoneCmdParamAudioOutput@@QAEXW4TPEAudioOutput@@@Z @ 196 NONAME ; void TPhoneCmdParamAudioOutput::SetAudioOutput(enum TPEAudioOutput)
-	?HeaderText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 197 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::HeaderText(void) const
-	?CallImageThemeSettings@CPhoneCallThemeMonitor@@QBEHXZ @ 198 NONAME ; int CPhoneCallThemeMonitor::CallImageThemeSettings(void) const
-	?SetLocation@TPhoneCmdParamSpeedDial@@QAEXH@Z @ 199 NONAME ; void TPhoneCmdParamSpeedDial::SetLocation(int)
-	??0TPhoneCmdParamTransEffect@@QAE@XZ @ 200 NONAME ; TPhoneCmdParamTransEffect::TPhoneCmdParamTransEffect(void)
-	?Number@TPhoneCmdParamSfiData@@QBEABVTDesC16@@XZ @ 201 NONAME ; class TDesC16 const & TPhoneCmdParamSfiData::Number(void) const
-	?OwnPhoneNumberText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 202 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::OwnPhoneNumberText(void) const
-	?QueryPrompt@TPhoneCmdParamQuery@@QBEABVTDesC16@@XZ @ 203 NONAME ; class TDesC16 const & TPhoneCmdParamQuery::QueryPrompt(void) const
-	?SetQueryPrompt@TPhoneCmdParamQuery@@QAEXABVTDesC16@@@Z @ 204 NONAME ; void TPhoneCmdParamQuery::SetQueryPrompt(class TDesC16 const &)
-	?NewL@CPhoneQwertyHandler@@SAPAV1@XZ @ 205 NONAME ; class CPhoneQwertyHandler * CPhoneQwertyHandler::NewL(void)
-	?IsNumericKey@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 206 NONAME ; int CPhoneKeys::IsNumericKey(struct TKeyEvent const &, enum TEventCode)
-	?SetCaptureType@TPhoneCmdParamKeyCapture@@QAEXW4TPhoneCaptureType@@@Z @ 207 NONAME ; void TPhoneCmdParamKeyCapture::SetCaptureType(enum TPhoneCaptureType)
-	?ViewUid@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 208 NONAME ; class TUid TPhoneCmdParamAppInfo::ViewUid(void) const
-	?CallFlag@TPhoneCmdParamCallHeaderData@@QBEKXZ @ 209 NONAME ; unsigned long TPhoneCmdParamCallHeaderData::CallFlag(void) const
-	?SetLabelText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 210 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetLabelText(class TDesC16 const &)
-	??0TPhoneCmdParamSpeedDial@@QAE@XZ @ 211 NONAME ; TPhoneCmdParamSpeedDial::TPhoneCmdParamSpeedDial(void)
-	?IsCallerText@TPhoneCmdParamRingTone@@QAEHXZ @ 212 NONAME ; int TPhoneCmdParamRingTone::IsCallerText(void)
-	?SetBitmap@TPhoneCmdParamBitmap@@QAEXPAVCFbsBitmap@@@Z @ 213 NONAME ; void TPhoneCmdParamBitmap::SetBitmap(class CFbsBitmap *)
-	?SetNumber@TPhoneCmdParamSfiData@@QAEXABVTDesC16@@@Z @ 214 NONAME ; void TPhoneCmdParamSfiData::SetNumber(class TDesC16 const &)
-	?Location@TPhoneCmdParamSpeedDial@@QAEHXZ @ 215 NONAME ; int TPhoneCmdParamSpeedDial::Location(void)
-	?CipheringIndicatorAllowed@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 216 NONAME ; int TPhoneCmdParamCallHeaderData::CipheringIndicatorAllowed(void) const
-	?Name@TPhoneCmdParamSfiData@@QBEABVTDesC16@@XZ @ 217 NONAME ; class TDesC16 const & TPhoneCmdParamSfiData::Name(void) const
-	??0TPhoneCmdParamQuery@@QAE@ABV0@@Z @ 218 NONAME ; TPhoneCmdParamQuery::TPhoneCmdParamQuery(class TPhoneCmdParamQuery const &)
-	?CallState@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 219 NONAME ; int TPhoneCmdParamCallHeaderData::CallState(void) const
-	??0TPhoneCmdParamIncallIndicatorData@@QAE@XZ @ 220 NONAME ; TPhoneCmdParamIncallIndicatorData::TPhoneCmdParamIncallIndicatorData(void)
-	?Picture@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 221 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::Picture(void) const
-	?SetCallThemeSettingsObserver@CPhoneCallThemeMonitor@@QAEXPAVMPhoneCallThemeSettingsObserver@@@Z @ 222 NONAME ; void CPhoneCallThemeMonitor::SetCallThemeSettingsObserver(class MPhoneCallThemeSettingsObserver *)
-	?ServiceId@TPhoneCmdParamCallHeaderData@@QBEKXZ @ 223 NONAME ; unsigned long TPhoneCmdParamCallHeaderData::ServiceId(void) const
-	?LabelText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 224 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::LabelText(void) const
-	?Overflow@CPhoneLogger@@EAEXAAVTDes16@@@Z @ 225 NONAME ; void CPhoneLogger::Overflow(class TDes16 &)
-	?SetServiceId@TPhoneCmdParamSpeedDial@@QAEXI@Z @ 226 NONAME ; void TPhoneCmdParamSpeedDial::SetServiceId(unsigned int)
-	?SetKeyEvent@TPhoneCmdParamKeyEvent@@QAEXABUTKeyEvent@@@Z @ 227 NONAME ; void TPhoneCmdParamKeyEvent::SetKeyEvent(struct TKeyEvent const &)
-	?Instance@CPhonePubSubProxy@@SAPAV1@XZ @ 228 NONAME ; class CPhonePubSubProxy * CPhonePubSubProxy::Instance(void)
-	?ResourceId@TPhoneCmdParamNote@@QBEHXZ @ 229 NONAME ; int TPhoneCmdParamNote::ResourceId(void) const
-	?CipheringIndicatorAllowed@TPhoneCmdParamEmergencyCallHeaderData@@QBEHXZ @ 230 NONAME ; int TPhoneCmdParamEmergencyCallHeaderData::CipheringIndicatorAllowed(void) const
-	?CancelAllNotifies@CPhoneCenRepProxy@@SAXPAVMPhoneCenRepObserver@@@Z @ 231 NONAME ; void CPhoneCenRepProxy::CancelAllNotifies(class MPhoneCenRepObserver *)
-	??1CPhoneQwertyHandler@@UAE@XZ @ 232 NONAME ; CPhoneQwertyHandler::~CPhoneQwertyHandler(void)
-	?TextResourceId@TPhoneCmdParamNote@@QBEHXZ @ 233 NONAME ; int TPhoneCmdParamNote::TextResourceId(void) const
-	?SetRemotePhoneNumber@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 234 NONAME ; void TPhoneCmdParamCallHeaderData::SetRemotePhoneNumber(class TDesC16 const &)
-	?CipheringIndicatorAllowed@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 235 NONAME ; int TPhoneCmdParamIncallIndicatorData::CipheringIndicatorAllowed(void) const
-	?SetScreenLocked@CPhoneStorage@@UAEXH@Z @ 236 NONAME ; void CPhoneStorage::SetScreenLocked(int)
-	??0TPhoneCmdParamCallStateData@@QAE@XZ @ 237 NONAME ; TPhoneCmdParamCallStateData::TPhoneCmdParamCallStateData(void)
-	?SetKeyCode@TPhoneCmdParamKeyCapture@@QAEXW4TKeyCode@@@Z @ 238 NONAME ; void TPhoneCmdParamKeyCapture::SetKeyCode(enum TKeyCode)
-	?CustomMessageId@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 239 NONAME ; class TUid TPhoneCmdParamAppInfo::CustomMessageId(void) const
-	?RemotePhoneNumber@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 240 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::RemotePhoneNumber(void) const
-	?SetType@TPhoneCmdParamNote@@QAEXW4TPhoneNoteType@@@Z @ 241 NONAME ; void TPhoneCmdParamNote::SetType(enum TPhoneNoteType)
-	?Instance@CPhoneClearBlacklist@@SAPAV1@XZ @ 242 NONAME ; class CPhoneClearBlacklist * CPhoneClearBlacklist::Instance(void)
-	?TextToSay@TPhoneCmdParamRingTone@@QBEABVTDesC16@@XZ @ 243 NONAME ; class TDesC16 const & TPhoneCmdParamRingTone::TextToSay(void) const
-	?Type@TPhoneCmdParamNote@@QBE?AW4TPhoneNoteType@@XZ @ 244 NONAME ; enum TPhoneNoteType TPhoneCmdParamNote::Type(void) const
-	??0TPhoneCmdParamReconnectQuery@@QAE@AAVMCaUiReconnectQueryObserver@@@Z @ 245 NONAME ; TPhoneCmdParamReconnectQuery::TPhoneCmdParamReconnectQuery(class MCaUiReconnectQueryObserver &)
-	?SetCallFlag@TPhoneCmdParamCallHeaderData@@QAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 246 NONAME ; void TPhoneCmdParamCallHeaderData::SetCallFlag(enum CBubbleManager::TPhoneCallTypeFlags)
-	?SetPicture@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 247 NONAME ; void TPhoneCmdParamCallHeaderData::SetPicture(class TDesC16 const &)
-	?Integer@TPhoneCmdParamInteger@@QBEHXZ @ 248 NONAME ; int TPhoneCmdParamInteger::Integer(void) const
-	?Mode@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 249 NONAME ; int TPhoneCmdParamIncallIndicatorData::Mode(void) const
-	?SetText@TPhoneCmdParamNote@@QAEXABVTDesC16@@@Z @ 250 NONAME ; void TPhoneCmdParamNote::SetText(class TDesC16 const &)
-	?SetCallerTextStatus@TPhoneCmdParamRingTone@@QAEXH@Z @ 251 NONAME ; void TPhoneCmdParamRingTone::SetCallerTextStatus(int)
-	?IsWiredAccAvailable@TPhoneCmdParamAudioAvailability@@QBEHXZ @ 252 NONAME ; int TPhoneCmdParamAudioAvailability::IsWiredAccAvailable(void) const
-	?SetWaitForReady@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 253 NONAME ; void TPhoneCmdParamGlobalNote::SetWaitForReady(int)
-	??0TPhoneCmdParamBoolean@@QAE@XZ @ 254 NONAME ; TPhoneCmdParamBoolean::TPhoneCmdParamBoolean(void)
-	?QueryCommandObserver@TPhoneCmdParamQuery@@QAEPAVMPhoneQueryCommandObserver@@XZ @ 255 NONAME ; class MPhoneQueryCommandObserver * TPhoneCmdParamQuery::QueryCommandObserver(void)
-	?DataText@TPhoneCmdParamQuery@@QBEPAVTDes16@@XZ @ 256 NONAME ; class TDes16 * TPhoneCmdParamQuery::DataText(void) const
-	?SetType@TPhoneCmdParamSingleItemFetch@@QAEXW4TFetchType@CPhCntSingleItemFetch@@@Z @ 257 NONAME ; void TPhoneCmdParamSingleItemFetch::SetType(enum CPhCntSingleItemFetch::TFetchType)
-	?SetReal@CPhoneCenRepProxy@@QAEHABVTUid@@IN@Z @ 258 NONAME ; int CPhoneCenRepProxy::SetReal(class TUid const &, unsigned int, double)
-	??0TPhoneCmdParamCustomDialer@@QAE@XZ @ 259 NONAME ; TPhoneCmdParamCustomDialer::TPhoneCmdParamCustomDialer(void)
-	??1CPhonePubSubProxy@@UAE@XZ @ 260 NONAME ; CPhonePubSubProxy::~CPhonePubSubProxy(void)
-	?NumericKeyCode@CPhoneQwertyHandler@@QAEHABUTKeyEvent@@@Z @ 261 NONAME ; int CPhoneQwertyHandler::NumericKeyCode(struct TKeyEvent const &)
-	?SetMessageData@TPhoneCmdParamMessageEditor@@QAEXPAVCMessageData@@@Z @ 262 NONAME ; void TPhoneCmdParamMessageEditor::SetMessageData(class CMessageData *)
-	??0TPhoneCmdParamNote@@QAE@XZ @ 263 NONAME ; TPhoneCmdParamNote::TPhoneCmdParamNote(void)
-	?Volume@TPhoneCmdParamRingTone@@QBEHXZ @ 264 NONAME ; int TPhoneCmdParamRingTone::Volume(void) const
-	?SetItemTextArrayForListQuery@TPhoneCmdParamQuery@@QAEXAAVMDesC16Array@@@Z @ 265 NONAME ; void TPhoneCmdParamQuery::SetItemTextArrayForListQuery(class MDesC16Array &)
-	?Type@TPhoneCmdParamRingTone@@QBE?AW4TPhoneRingToneType@@XZ @ 266 NONAME ; enum TPhoneRingToneType TPhoneCmdParamRingTone::Type(void) const
-	?Key@TPhoneCmdParamKeyCapture@@QBE?AW4TStdScanCode@@XZ @ 267 NONAME ; enum TStdScanCode TPhoneCmdParamKeyCapture::Key(void) const
-	?LabelText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 268 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::LabelText(void) const
-	?Ciphering@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 269 NONAME ; int TPhoneCmdParamIncallIndicatorData::Ciphering(void) const
-	?SetQueryCommandObserver@TPhoneCmdParamQuery@@QAEXAAVMPhoneQueryCommandObserver@@@Z @ 270 NONAME ; void TPhoneCmdParamQuery::SetQueryCommandObserver(class MPhoneQueryCommandObserver &)
-	?IsPhoneUIFeatureSupported@CPhoneCenRepProxy@@QAEHH@Z @ 271 NONAME ; int CPhoneCenRepProxy::IsPhoneUIFeatureSupported(int)
-	?DefaultCba@TPhoneCmdParamQuery@@QBEHXZ @ 272 NONAME ; int TPhoneCmdParamQuery::DefaultCba(void) const
-	?CallState@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 273 NONAME ; int TPhoneCmdParamIncallIndicatorData::CallState(void) const
-	??0TPhoneCmdParamNumberEntryObserver@@QAE@XZ @ 274 NONAME ; TPhoneCmdParamNumberEntryObserver::TPhoneCmdParamNumberEntryObserver(void)
-	?MessageData@TPhoneCmdParamMessageEditor@@QBEPAVCMessageData@@XZ @ 275 NONAME ; class CMessageData * TPhoneCmdParamMessageEditor::MessageData(void) const
-	?SetLine2@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 276 NONAME ; void TPhoneCmdParamCallHeaderData::SetLine2(int)
-	?FetchValuesFromCenRepL@CPhoneCenRepProxy@@QAEXAAVTPhoneCmdParamAppInfo@@W4TKeyCode@@PAVHBufC8@@AAH@Z @ 277 NONAME ; void CPhoneCenRepProxy::FetchValuesFromCenRepL(class TPhoneCmdParamAppInfo &, enum TKeyCode, class HBufC8 *, int &)
-	?CNAPTextClippingDirection@TPhoneCmdParamCallHeaderData@@QBE?AW4TPhoneClippingDirection@CBubbleManager@@XZ @ 278 NONAME ; enum CBubbleManager::TPhoneClippingDirection TPhoneCmdParamCallHeaderData::CNAPTextClippingDirection(void) const
-	?ParticipantCLI@TPhoneCmdParamCallHeaderData@@QBE?AW4TPhoneParticipantListCLI@1@XZ @ 279 NONAME ; enum TPhoneCmdParamCallHeaderData::TPhoneParticipantListCLI TPhoneCmdParamCallHeaderData::ParticipantCLI(void) const
-	?Thumbnail@TPhoneCmdParamCallHeaderData@@QBEPAVCFbsBitmap@@XZ @ 280 NONAME ; class CFbsBitmap * TPhoneCmdParamCallHeaderData::Thumbnail(void) const
-	?SetTimeOut@TPhoneCmdParamQuery@@QAEXH@Z @ 281 NONAME ; void TPhoneCmdParamQuery::SetTimeOut(int)
-	?Boolean@TPhoneCmdParamBoolean@@QBEHXZ @ 282 NONAME ; int TPhoneCmdParamBoolean::Boolean(void) const
-	?LogMsgFromPhoneUIToPE@CPhoneLogger@@QAEXHH@Z @ 283 NONAME ; void CPhoneLogger::LogMsgFromPhoneUIToPE(int, int)
-	?SetCustomMessageId@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 284 NONAME ; void TPhoneCmdParamAppInfo::SetCustomMessageId(class TUid const &)
-	?ResolveResourceID@CPhoneResourceResolverBase@@UBEHABH@Z @ 285 NONAME ; int CPhoneResourceResolverBase::ResolveResourceID(int const &) const
-	?SetName@TPhoneCmdParamSfiData@@QAEXABVTDesC16@@@Z @ 286 NONAME ; void TPhoneCmdParamSfiData::SetName(class TDesC16 const &)
-	?TitlePaneResourceId@TPhoneCmdParamSingleItemFetch@@QBEHXZ @ 287 NONAME ; int TPhoneCmdParamSingleItemFetch::TitlePaneResourceId(void) const
-	?SetType@TPhoneCmdParamGlobalNote@@QAEXW4TAknGlobalNoteType@@@Z @ 288 NONAME ; void TPhoneCmdParamGlobalNote::SetType(enum TAknGlobalNoteType)
-	?IncludeVideoCallOption@TPhoneCmdParamReconnectQuery@@QBEHXZ @ 289 NONAME ; int TPhoneCmdParamReconnectQuery::IncludeVideoCallOption(void) const
-	?SetLittleBubbleVisible@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 290 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetLittleBubbleVisible(int)
-	?Ciphering@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 291 NONAME ; int TPhoneCmdParamCallHeaderData::Ciphering(void) const
-	?SetType@TPhoneCmdParamRingTone@@QAEXW4TPhoneRingToneType@@@Z @ 292 NONAME ; void TPhoneCmdParamRingTone::SetType(enum TPhoneRingToneType)
-	?ResourceId@TPhoneCmdParamDynMenu@@QBEHXZ @ 293 NONAME ; int TPhoneCmdParamDynMenu::ResourceId(void) const
-	?SetCipheringIndicatorAllowed@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 294 NONAME ; void TPhoneCmdParamCallHeaderData::SetCipheringIndicatorAllowed(int)
-	?SetWaitTime@TPhoneCmdParamProgressNote@@QAEXVTTimeIntervalMicroSeconds32@@@Z @ 295 NONAME ; void TPhoneCmdParamProgressNote::SetWaitTime(class TTimeIntervalMicroSeconds32)
-	?Ciphering@TPhoneCmdParamEmergencyCallHeaderData@@QBEHXZ @ 296 NONAME ; int TPhoneCmdParamEmergencyCallHeaderData::Ciphering(void) const
-	??1CPhoneCallThemeMonitor@@UAE@XZ @ 297 NONAME ; CPhoneCallThemeMonitor::~CPhoneCallThemeMonitor(void)
-	?SetNumberType@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 298 NONAME ; void TPhoneCmdParamCallHeaderData::SetNumberType(int)
-	?Mute@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 299 NONAME ; int TPhoneCmdParamIncallIndicatorData::Mute(void) const
-	?IsQwertyInput@CPhoneQwertyHandler@@QBEHXZ @ 300 NONAME ; int CPhoneQwertyHandler::IsQwertyInput(void) const
-	?SetBoolean@TPhoneCmdParamBoolean@@QAEXH@Z @ 301 NONAME ; void TPhoneCmdParamBoolean::SetBoolean(int)
-	?IsTelephonyFeatureSupported@CPhoneResourceResolverBase@@MBEHH@Z @ 302 NONAME ; int CPhoneResourceResolverBase::IsTelephonyFeatureSupported(int) const
-	?Instance@CPhoneMainErrorMessagesHandler@@SAPAV1@XZ @ 303 NONAME ; class CPhoneMainErrorMessagesHandler * CPhoneMainErrorMessagesHandler::Instance(void)
-	?SetViewUid@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 304 NONAME ; void TPhoneCmdParamAppInfo::SetViewUid(class TUid const &)
-	?SetServiceId@TPhoneCmdParamCallHeaderData@@QAEXK@Z @ 305 NONAME ; void TPhoneCmdParamCallHeaderData::SetServiceId(unsigned long)
-	?Instance@CPhoneCenRepProxy@@SAPAV1@XZ @ 306 NONAME ; class CPhoneCenRepProxy * CPhoneCenRepProxy::Instance(void)
-	?AddCallFlag@TPhoneCmdParamCallHeaderData@@QAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 307 NONAME ; void TPhoneCmdParamCallHeaderData::AddCallFlag(enum CBubbleManager::TPhoneCallTypeFlags)
-	?SetQueryType@TPhoneCmdParamQuery@@QAEXW4TPhoneQueryType@@@Z @ 308 NONAME ; void TPhoneCmdParamQuery::SetQueryType(enum TPhoneQueryType)
-	?Value@CPhonePubSubProxy@@QAEHABVTUid@@I@Z @ 309 NONAME ; int CPhonePubSubProxy::Value(class TUid const &, unsigned int)
-	?SetWiredAccAvailable@TPhoneCmdParamAudioAvailability@@QAEXH@Z @ 310 NONAME ; void TPhoneCmdParamAudioAvailability::SetWiredAccAvailable(int)
-	?SetString@TPhoneCmdParamSingleItemFetch@@QAEXPAVTDes16@@@Z @ 311 NONAME ; void TPhoneCmdParamSingleItemFetch::SetString(class TDes16 *)
-	??0TPhoneCmdParamAudioOutput@@QAE@XZ @ 312 NONAME ; TPhoneCmdParamAudioOutput::TPhoneCmdParamAudioOutput(void)
-	?IsCallerImage@TPhoneCmdParamRingTone@@QAEHXZ @ 313 NONAME ; int TPhoneCmdParamRingTone::IsCallerImage(void)
-	??0TPhoneCmdParamQuery@@QAE@XZ @ 314 NONAME ; TPhoneCmdParamQuery::TPhoneCmdParamQuery(void)
-	?SetPhoneNumber@TPhoneCmdParamReconnectQuery@@QAEXVTPtrC16@@@Z @ 315 NONAME ; void TPhoneCmdParamReconnectQuery::SetPhoneNumber(class TPtrC16)
-	?Instance@CPhoneMainResourceResolver@@SAPAV1@XZ @ 316 NONAME ; class CPhoneMainResourceResolver * CPhoneMainResourceResolver::Instance(void)
-	?ServiceId@TPhoneCmdParamSpeedDial@@QBEIXZ @ 317 NONAME ; unsigned int TPhoneCmdParamSpeedDial::ServiceId(void) const
-	??1CPhoneLibraryContainer@@UAE@XZ @ 318 NONAME ; CPhoneLibraryContainer::~CPhoneLibraryContainer(void)
-	?ClearBlackListOnNextKey@CPhoneClearBlacklist@@QAEXXZ @ 319 NONAME ; void CPhoneClearBlacklist::ClearBlackListOnNextKey(void)
-	?Tone@TPhoneCmdParamQuery@@QBEHXZ @ 320 NONAME ; int TPhoneCmdParamQuery::Tone(void) const
-	?SetNumberType@TPhoneCmdParamSpeedDial@@QAEXW4TPhoneNumberType@@@Z @ 321 NONAME ; void TPhoneCmdParamSpeedDial::SetNumberType(enum TPhoneNumberType)
-	?SetRingingType@TPhoneCmdParamRingTone@@QAEXH@Z @ 322 NONAME ; void TPhoneCmdParamRingTone::SetRingingType(int)
-	?CbaResourceId@TPhoneCmdParamSingleItemFetch@@QBEHXZ @ 323 NONAME ; int TPhoneCmdParamSingleItemFetch::CbaResourceId(void) const
-	?SetCiphering@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 324 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCiphering(int)
-	?SetCipheringIndicatorAllowed@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 325 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCipheringIndicatorAllowed(int)
-	?NeedToEnableKeylock@CPhoneStorage@@UAEHXZ @ 326 NONAME ; int CPhoneStorage::NeedToEnableKeylock(void)
-	?AudioOutput@TPhoneCmdParamAudioOutput@@QBE?AW4TPEAudioOutput@@XZ @ 327 NONAME ; enum TPEAudioOutput TPhoneCmdParamAudioOutput::AudioOutput(void) const
-	?SetResourceId@TPhoneCmdParamProgressNote@@QAEXH@Z @ 328 NONAME ; void TPhoneCmdParamProgressNote::SetResourceId(int)
-	??0TPhoneCmdParamInteger@@QAE@XZ @ 329 NONAME ; TPhoneCmdParamInteger::TPhoneCmdParamInteger(void)
-	?Type@TPhoneCmdParamSingleItemFetch@@QAE?AW4TFetchType@CPhCntSingleItemFetch@@XZ @ 330 NONAME ; enum CPhCntSingleItemFetch::TFetchType TPhoneCmdParamSingleItemFetch::Type(void)
-	?SetType@TPhoneCmdParamTransEffect@@QAEXW4TPhoneTransEffectType@@@Z @ 331 NONAME ; void TPhoneCmdParamTransEffect::SetType(enum TPhoneTransEffectType)
-	?Bitmap@TPhoneCmdParamBitmap@@QBEPAVCFbsBitmap@@XZ @ 332 NONAME ; class CFbsBitmap * TPhoneCmdParamBitmap::Bitmap(void) const
-	?SetTone@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 333 NONAME ; void TPhoneCmdParamGlobalNote::SetTone(int)
-	?After@CPhoneTimer@@QAEXVTTimeIntervalMicroSeconds32@@VTCallBack@@@Z @ 334 NONAME ; void CPhoneTimer::After(class TTimeIntervalMicroSeconds32, class TCallBack)
-	?ContactMatcher@TPhoneCmdParamReconnectQuery@@QBEPAVCPhCntMatcher@@XZ @ 335 NONAME ; class CPhCntMatcher * TPhoneCmdParamReconnectQuery::ContactMatcher(void) const
+	?SetText@TPhoneCmdParamGlobalNote@@QAEXABVTDesC16@@@Z @ 38 NONAME ; void TPhoneCmdParamGlobalNote::SetText(class TDesC16 const &)
+	?AddLibraryL@CPhoneLibraryContainer@@QAEXABVRLibrary@@@Z @ 39 NONAME ; void CPhoneLibraryContainer::AddLibraryL(class RLibrary const &)
+	??1CPhoneResourceResolverBase@@UAE@XZ @ 40 NONAME ; CPhoneResourceResolverBase::~CPhoneResourceResolverBase(void)
+	?SetInt@CPhoneCenRepProxy@@QAEHABVTUid@@IH@Z @ 41 NONAME ; int CPhoneCenRepProxy::SetInt(class TUid const &, unsigned int, int)
+	?GetCustomCommandForTimeOut@TPhoneCmdParamQuery@@QBEHAAH@Z @ 42 NONAME ; int TPhoneCmdParamQuery::GetCustomCommandForTimeOut(int &) const
+	?ParamId@TPhoneCommandParam@@QBE?AW4TPhoneParamId@1@XZ @ 43 NONAME ; enum TPhoneCommandParam::TPhoneParamId TPhoneCommandParam::ParamId(void) const
+	?SetString@CPhoneCenRepProxy@@QAEHABVTUid@@IABVTDesC16@@@Z @ 44 NONAME ; int CPhoneCenRepProxy::SetString(class TUid const &, unsigned int, class TDesC16 const &)
+	?Line2@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 45 NONAME ; int TPhoneCmdParamCallHeaderData::Line2(void) const
+	??1CPhoneTimer@@UAE@XZ @ 46 NONAME ; CPhoneTimer::~CPhoneTimer(void)
+	?LogMsgFromPEToPhoneUIEnd@CPhoneLogger@@QAEXH@Z @ 47 NONAME ; void CPhoneLogger::LogMsgFromPEToPhoneUIEnd(int)
+	?DialerController@TPhoneCmdParamCustomDialer@@QAEPAVMPhoneDialerController@@XZ @ 48 NONAME ; class MPhoneDialerController * TPhoneCmdParamCustomDialer::DialerController(void)
+	?Type@TPhoneCmdParamGlobalNote@@QBE?AW4TAknGlobalNoteType@@XZ @ 49 NONAME ; enum TAknGlobalNoteType TPhoneCmdParamGlobalNote::Type(void) const
+	?SetMultipleInstances@TPhoneCmdParamAppInfo@@QAEXH@Z @ 50 NONAME ; void TPhoneCmdParamAppInfo::SetMultipleInstances(int)
+	?Tone@TPhoneCmdParamGlobalNote@@QBEHXZ @ 51 NONAME ; int TPhoneCmdParamGlobalNote::Tone(void) const
+	?ChangePropertyValue@CPhonePubSubProxy@@QAEXABVTUid@@IH@Z @ 52 NONAME ; void CPhonePubSubProxy::ChangePropertyValue(class TUid const &, unsigned int, int)
+	?SetThumbnail@TPhoneCmdParamCallHeaderData@@QAEXPAVCFbsBitmap@@@Z @ 53 NONAME ; void TPhoneCmdParamCallHeaderData::SetThumbnail(class CFbsBitmap *)
+	?SetCbaCommandMapping@TPhoneCmdParamQuery@@QAEXHH@Z @ 54 NONAME ; void TPhoneCmdParamQuery::SetCbaCommandMapping(int, int)
+	?EventCode@TPhoneCmdParamKeyEvent@@QBE?AW4TEventCode@@XZ @ 55 NONAME ; enum TEventCode TPhoneCmdParamKeyEvent::EventCode(void) const
+	?KeyEvent@TPhoneCmdParamKeyEvent@@QBE?BUTKeyEvent@@XZ @ 56 NONAME ; struct TKeyEvent const TPhoneCmdParamKeyEvent::KeyEvent(void) const
+	?SetDataText@TPhoneCmdParamQuery@@QAEXPAVTDes16@@@Z @ 57 NONAME ; void TPhoneCmdParamQuery::SetDataText(class TDes16 *)
+	??0TPhoneCmdParamAppInfo@@QAE@XZ @ 58 NONAME ; TPhoneCmdParamAppInfo::TPhoneCmdParamAppInfo(void)
+	?LittleBubbleVisible@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 59 NONAME ; int TPhoneCmdParamIncallIndicatorData::LittleBubbleVisible(void) const
+	?SetCallState@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 60 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCallState(int)
+	?GetString@CPhoneCenRepProxy@@QBEHABVTUid@@IAAVTDes16@@@Z @ 61 NONAME ; int CPhoneCenRepProxy::GetString(class TUid const &, unsigned int, class TDes16 &) const
+	?ResourceId@TPhoneCmdParamProgressNote@@QBEHXZ @ 62 NONAME ; int TPhoneCmdParamProgressNote::ResourceId(void) const
+	?ReconnectQueryObserver@TPhoneCmdParamReconnectQuery@@QBEAAVMCaUiReconnectQueryObserver@@XZ @ 63 NONAME ; class MCaUiReconnectQueryObserver & TPhoneCmdParamReconnectQuery::ReconnectQueryObserver(void) const
+	?CallId@TPhoneCmdParamCallStateData@@QBEHXZ @ 64 NONAME ; int TPhoneCmdParamCallStateData::CallId(void) const
+	?SetContactMatcher@TPhoneCmdParamReconnectQuery@@QAEXPAVCPhCntMatcher@@@Z @ 65 NONAME ; void TPhoneCmdParamReconnectQuery::SetContactMatcher(class CPhCntMatcher *)
+	?NotifyChangeL@CPhoneCenRepProxy@@QAEXABVTUid@@IPAVMPhoneCenRepObserver@@@Z @ 66 NONAME ; void CPhoneCenRepProxy::NotifyChangeL(class TUid const &, unsigned int, class MPhoneCenRepObserver *)
+	?SetResourceId@TPhoneCmdParamDynMenu@@QAEXH@Z @ 67 NONAME ; void TPhoneCmdParamDynMenu::SetResourceId(int)
+	?Validate@CPhoneKeys@@SAHABVTDesC16@@@Z @ 68 NONAME ; int CPhoneKeys::Validate(class TDesC16 const &)
+	??0TPhoneCmdParamKeyCapture@@QAE@XZ @ 69 NONAME ; TPhoneCmdParamKeyCapture::TPhoneCmdParamKeyCapture(void)
+	?SetResourceId@TPhoneCmdParamNote@@QAEXH@Z @ 70 NONAME ; void TPhoneCmdParamNote::SetResourceId(int)
+	?LogMsgFromPEToPhoneUI@CPhoneLogger@@QAEXHH@Z @ 71 NONAME ; void CPhoneLogger::LogMsgFromPEToPhoneUI(int, int)
+	??0TPhoneCmdParamProgressNote@@QAE@XZ @ 72 NONAME ; TPhoneCmdParamProgressNote::TPhoneCmdParamProgressNote(void)
+	?CallState@TPhoneCmdParamCallStateData@@QBEHXZ @ 73 NONAME ; int TPhoneCmdParamCallStateData::CallState(void) const
+	?SetPointer@TPhoneCmdParamPointer@@QAEXPAX@Z @ 74 NONAME ; void TPhoneCmdParamPointer::SetPointer(void *)
+	??1CPhoneCenRepProxy@@UAE@XZ @ 75 NONAME ; CPhoneCenRepProxy::~CPhoneCenRepProxy(void)
+	?SetEventCode@TPhoneCmdParamKeyEvent@@QAEXW4TEventCode@@@Z @ 76 NONAME ; void TPhoneCmdParamKeyEvent::SetEventCode(enum TEventCode)
+	?WaitTime@TPhoneCmdParamProgressNote@@QBE?AVTTimeIntervalMicroSeconds32@@XZ @ 77 NONAME ; class TTimeIntervalMicroSeconds32 TPhoneCmdParamProgressNote::WaitTime(void) const
+	?SetParam@TPhoneCmdParamAppInfo@@QAEXABVTDesC8@@@Z @ 78 NONAME ; void TPhoneCmdParamAppInfo::SetParam(class TDesC8 const &)
+	?CallType@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 79 NONAME ; int TPhoneCmdParamCallHeaderData::CallType(void) const
+	??0TPhoneCmdParamPointer@@QAE@XZ @ 80 NONAME ; TPhoneCmdParamPointer::TPhoneCmdParamPointer(void)
+	??0TPhoneCmdParamGlobalNote@@QAE@XZ @ 81 NONAME ; TPhoneCmdParamGlobalNote::TPhoneCmdParamGlobalNote(void)
+	?SetCiphering@TPhoneCmdParamEmergencyCallHeaderData@@QAEXH@Z @ 82 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetCiphering(int)
+	?SetTone@TPhoneCmdParamNote@@QAEXW4TTone@CAknNoteDialog@@@Z @ 83 NONAME ; void TPhoneCmdParamNote::SetTone(enum CAknNoteDialog::TTone)
+	?SetCustomCommandForTimeOut@TPhoneCmdParamQuery@@QAEXH@Z @ 84 NONAME ; void TPhoneCmdParamQuery::SetCustomCommandForTimeOut(int)
+	?SetIncludeVideoOption@TPhoneCmdParamReconnectQuery@@QAEXH@Z @ 85 NONAME ; void TPhoneCmdParamReconnectQuery::SetIncludeVideoOption(int)
+	?IsBTAccAvailable@TPhoneCmdParamAudioAvailability@@QBEHXZ @ 86 NONAME ; int TPhoneCmdParamAudioAvailability::IsBTAccAvailable(void) const
+	?Timeout@TPhoneCmdParamNote@@QBE?AW4TTimeout@CAknNoteDialog@@XZ @ 87 NONAME ; enum CAknNoteDialog::TTimeout TPhoneCmdParamNote::Timeout(void) const
+	?Instance@CPhoneRecoverySystem@@SAPAV1@XZ @ 88 NONAME ; class CPhoneRecoverySystem * CPhoneRecoverySystem::Instance(void)
+	?CancelTimer@CPhoneTimer@@QAEXXZ @ 89 NONAME ; void CPhoneTimer::CancelTimer(void)
+	?NewL@CPhoneTimer@@SAPAV1@H@Z @ 90 NONAME ; class CPhoneTimer * CPhoneTimer::NewL(int)
+	?GetInt@CPhoneCenRepProxy@@QBEHABVTUid@@IAAH@Z @ 91 NONAME ; int CPhoneCenRepProxy::GetInt(class TUid const &, unsigned int, int &) const
+	?SetTextToSay@TPhoneCmdParamRingTone@@QAEXABVTDesC16@@@Z @ 92 NONAME ; void TPhoneCmdParamRingTone::SetTextToSay(class TDesC16 const &)
+	?SetCallState@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 93 NONAME ; void TPhoneCmdParamCallHeaderData::SetCallState(int)
+	?ContentCba@TPhoneCmdParamQuery@@QBEHXZ @ 94 NONAME ; int TPhoneCmdParamQuery::ContentCba(void) const
+	?SetTextResourceId@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 95 NONAME ; void TPhoneCmdParamGlobalNote::SetTextResourceId(int)
+	??0TPhoneCmdParamDynMenu@@QAE@XZ @ 96 NONAME ; TPhoneCmdParamDynMenu::TPhoneCmdParamDynMenu(void)
+	?CancelAllNotifications@CPhonePubSubProxy@@SAXPAVMPhonePubSubObserver@@@Z @ 97 NONAME ; void CPhonePubSubProxy::CancelAllNotifications(class MPhonePubSubObserver *)
+	??0TPhoneCommandParam@@QAE@XZ @ 98 NONAME ; TPhoneCommandParam::TPhoneCommandParam(void)
+	?SetCNAPText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@W4TPhoneClippingDirection@CBubbleManager@@@Z @ 99 NONAME ; void TPhoneCmdParamCallHeaderData::SetCNAPText(class TDesC16 const &, enum CBubbleManager::TPhoneClippingDirection)
+	??1CPhoneLogger@@UAE@XZ @ 100 NONAME ; CPhoneLogger::~CPhoneLogger(void)
+	?Softkeys@TPhoneCmdParamGlobalNote@@QBEHXZ @ 101 NONAME ; int TPhoneCmdParamGlobalNote::Softkeys(void) const
+	??0TPhoneCmdParamMessageEditor@@QAE@XZ @ 102 NONAME ; TPhoneCmdParamMessageEditor::TPhoneCmdParamMessageEditor(void)
+	?SetCallState@TPhoneCmdParamCallStateData@@QAEXH@Z @ 103 NONAME ; void TPhoneCmdParamCallStateData::SetCallState(int)
+	?CallerText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 104 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::CallerText(void) const
+	?String@TPhoneCmdParamString@@QAEPAVTPtr16@@XZ @ 105 NONAME ; class TPtr16 * TPhoneCmdParamString::String(void)
+	?SetKey@TPhoneCmdParamKeyCapture@@QAEXW4TStdScanCode@@@Z @ 106 NONAME ; void TPhoneCmdParamKeyCapture::SetKey(enum TStdScanCode)
+	?IsExtraChar@CPhoneKeys@@SAHH@Z @ 107 NONAME ; int CPhoneKeys::IsExtraChar(int)
+	?SetDynMenu@TPhoneCmdParamDynMenu@@QAEXPAX@Z @ 108 NONAME ; void TPhoneCmdParamDynMenu::SetDynMenu(void *)
+	?IsSecondHashKey@CPhoneKeys@@SAHABVTDes16@@@Z @ 109 NONAME ; int CPhoneKeys::IsSecondHashKey(class TDes16 const &)
+	?SetCallerImageStatus@TPhoneCmdParamRingTone@@QAEXH@Z @ 110 NONAME ; void TPhoneCmdParamRingTone::SetCallerImageStatus(int)
+	?GetReal@CPhoneCenRepProxy@@QBEHABVTUid@@IAAN@Z @ 111 NONAME ; int CPhoneCenRepProxy::GetReal(class TUid const &, unsigned int, double &) const
+	?SetShortLabelText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 112 NONAME ; void TPhoneCmdParamCallHeaderData::SetShortLabelText(class TDesC16 const &)
+	?SetDialerController@TPhoneCmdParamCustomDialer@@QAEXPAVMPhoneDialerController@@@Z @ 113 NONAME ; void TPhoneCmdParamCustomDialer::SetDialerController(class MPhoneDialerController *)
+	?RingTone@TPhoneCmdParamRingTone@@QBEABVTDesC16@@XZ @ 114 NONAME ; class TDesC16 const & TPhoneCmdParamRingTone::RingTone(void) const
+	?TimeOut@TPhoneCmdParamQuery@@QBEHXZ @ 115 NONAME ; int TPhoneCmdParamQuery::TimeOut(void) const
+	?ShortLabelText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 116 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::ShortLabelText(void) const
+	?SetInteger@TPhoneCmdParamInteger@@QAEXH@Z @ 117 NONAME ; void TPhoneCmdParamInteger::SetInteger(int)
+	?SetMaskBitmap@TPhoneCmdParamBitmap@@QAEXPAVCFbsBitmap@@@Z @ 118 NONAME ; void TPhoneCmdParamBitmap::SetMaskBitmap(class CFbsBitmap *)
+	?SetTimeout@TPhoneCmdParamNote@@QAEXW4TTimeout@CAknNoteDialog@@@Z @ 119 NONAME ; void TPhoneCmdParamNote::SetTimeout(enum CAknNoteDialog::TTimeout)
+	?SetCustomMessage@TPhoneCmdParamAppInfo@@QAEXABVTDesC8@@@Z @ 120 NONAME ; void TPhoneCmdParamAppInfo::SetCustomMessage(class TDesC8 const &)
+	?BaseConstructL@CPhoneResourceResolverBase@@QAEXXZ @ 121 NONAME ; void CPhoneResourceResolverBase::BaseConstructL(void)
+	?SetTextResourceId@TPhoneCmdParamNote@@QAEXH@Z @ 122 NONAME ; void TPhoneCmdParamNote::SetTextResourceId(int)
+	?SetString@TPhoneCmdParamString@@QAEXPAVTPtr16@@@Z @ 123 NONAME ; void TPhoneCmdParamString::SetString(class TPtr16 *)
+	?SetAppUid@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 124 NONAME ; void TPhoneCmdParamAppInfo::SetAppUid(class TUid const &)
+	?String@TPhoneCmdParamSingleItemFetch@@QBEPAVTDes16@@XZ @ 125 NONAME ; class TDes16 * TPhoneCmdParamSingleItemFetch::String(void) const
+	?SetBTAccAvailable@TPhoneCmdParamAudioAvailability@@QAEXH@Z @ 126 NONAME ; void TPhoneCmdParamAudioAvailability::SetBTAccAvailable(int)
+	?IsTelephonyFeatureSupported@CPhoneCenRepProxy@@QAEHH@Z @ 127 NONAME ; int CPhoneCenRepProxy::IsTelephonyFeatureSupported(int)
+	?CallImageThemeFilePath@CPhoneCallThemeMonitor@@QBE?AVTPtrC16@@XZ @ 128 NONAME ; class TPtrC16 CPhoneCallThemeMonitor::CallImageThemeFilePath(void) const
+	?HasThumbnail@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 129 NONAME ; int TPhoneCmdParamCallHeaderData::HasThumbnail(void) const
+	?ClearBlackListNow@CPhoneClearBlacklist@@QAEXXZ @ 130 NONAME ; void CPhoneClearBlacklist::ClearBlackListNow(void)
+	?SetCipheringIndicatorAllowed@TPhoneCmdParamEmergencyCallHeaderData@@QAEXH@Z @ 131 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetCipheringIndicatorAllowed(int)
+	?SetCommandParamId@TPhoneCmdParamQuery@@QAEXW4TPhoneParamId@TPhoneCommandParam@@@Z @ 132 NONAME ; void TPhoneCmdParamQuery::SetCommandParamId(enum TPhoneCommandParam::TPhoneParamId)
+	??0TPhoneCmdParamEmergencyCallHeaderData@@QAE@XZ @ 133 NONAME ; TPhoneCmdParamEmergencyCallHeaderData::TPhoneCmdParamEmergencyCallHeaderData(void)
+	?After@CPhoneTimer@@QAEXVTTimeIntervalMicroSeconds32@@PAVMPhoneTimer@@@Z @ 134 NONAME ; void CPhoneTimer::After(class TTimeIntervalMicroSeconds32, class MPhoneTimer *)
+	?NewL@CPhoneLibraryContainer@@SAPAV1@XZ @ 135 NONAME ; class CPhoneLibraryContainer * CPhoneLibraryContainer::NewL(void)
+	?CreateL@CPhoneClearBlacklist@@SAPAV1@AAVRWsSession@@ABVRWindowBase@@@Z @ 136 NONAME ; class CPhoneClearBlacklist * CPhoneClearBlacklist::CreateL(class RWsSession &, class RWindowBase const &)
+	?SetVolume@TPhoneCmdParamRingTone@@QAEXH@Z @ 137 NONAME ; void TPhoneCmdParamRingTone::SetVolume(int)
+	??0TPhoneCmdParamString@@QAE@XZ @ 138 NONAME ; TPhoneCmdParamString::TPhoneCmdParamString(void)
+	?SetContactLink@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC8@@@Z @ 139 NONAME ; void TPhoneCmdParamCallHeaderData::SetContactLink(class TDesC8 const &)
+	??4TPhoneCmdParamQuery@@QAEAAV0@ABV0@@Z @ 140 NONAME ; class TPhoneCmdParamQuery & TPhoneCmdParamQuery::operator=(class TPhoneCmdParamQuery const &)
+	??0TPhoneCmdParamAudioAvailability@@QAE@XZ @ 141 NONAME ; TPhoneCmdParamAudioAvailability::TPhoneCmdParamAudioAvailability(void)
+	??0TPhoneCmdParamRingTone@@QAE@XZ @ 142 NONAME ; TPhoneCmdParamRingTone::TPhoneCmdParamRingTone(void)
+	?Observer@TPhoneCmdParamNumberEntryObserver@@QAE?AVTCallBack@@XZ @ 143 NONAME ; class TCallBack TPhoneCmdParamNumberEntryObserver::Observer(void)
+	?SetSoftkeys@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 144 NONAME ; void TPhoneCmdParamGlobalNote::SetSoftkeys(int)
+	??0CPhoneResourceResolverBase@@IAE@XZ @ 145 NONAME ; CPhoneResourceResolverBase::CPhoneResourceResolverBase(void)
+	?SetCallId@TPhoneCmdParamCallStateData@@QAEXH@Z @ 146 NONAME ; void TPhoneCmdParamCallStateData::SetCallId(int)
+	?MultipleInstances@TPhoneCmdParamAppInfo@@QBEHXZ @ 147 NONAME ; int TPhoneCmdParamAppInfo::MultipleInstances(void) const
+	?ItemTextArrayForListQuery@TPhoneCmdParamQuery@@QBEPAVMDesC16Array@@XZ @ 148 NONAME ; class MDesC16Array * TPhoneCmdParamQuery::ItemTextArrayForListQuery(void) const
+	?SetHeaderText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 149 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetHeaderText(class TDesC16 const &)
+	?SetContentCba@TPhoneCmdParamQuery@@QAEXH@Z @ 150 NONAME ; void TPhoneCmdParamQuery::SetContentCba(int)
+	?CaptureType@TPhoneCmdParamKeyCapture@@QBE?AW4TPhoneCaptureType@@XZ @ 151 NONAME ; enum TPhoneCaptureType TPhoneCmdParamKeyCapture::CaptureType(void) const
+	?SetQueryResourceId@TPhoneCmdParamQuery@@QAEXH@Z @ 152 NONAME ; void TPhoneCmdParamQuery::SetQueryResourceId(int)
+	?CancelNotify@CPhoneCenRepProxy@@QAEXPAVMPhoneCenRepObserver@@I@Z @ 153 NONAME ; void CPhoneCenRepProxy::CancelNotify(class MPhoneCenRepObserver *, unsigned int)
+	?Param@TPhoneCmdParamAppInfo@@QBEABVTDesC8@@XZ @ 154 NONAME ; class TDesC8 const & TPhoneCmdParamAppInfo::Param(void) const
+	??0CPhoneMethodLogger@@QAE@W4TPhoneUILoggingComponent@@VTPtrC16@@@Z @ 155 NONAME ; CPhoneMethodLogger::CPhoneMethodLogger(enum TPhoneUILoggingComponent, class TPtrC16)
+	?IsDtmfTone@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 156 NONAME ; int CPhoneKeys::IsDtmfTone(struct TKeyEvent const &, enum TEventCode)
+	?SetMode@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 157 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetMode(int)
+	?NewL@CPhoneCallThemeMonitor@@SAPAV1@XZ @ 158 NONAME ; class CPhoneCallThemeMonitor * CPhoneCallThemeMonitor::NewL(void)
+	?SetCLIText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@W4TPhoneClippingDirection@CBubbleManager@@@Z @ 159 NONAME ; void TPhoneCmdParamCallHeaderData::SetCLIText(class TDesC16 const &, enum CBubbleManager::TPhoneClippingDirection)
+	?SetPhoneNumber@TPhoneCmdParamSpeedDial@@QAEXPAVTPtr16@@@Z @ 160 NONAME ; void TPhoneCmdParamSpeedDial::SetPhoneNumber(class TPtr16 *)
+	?SendKeyEnabled@TPhoneCmdParamQuery@@QBEHXZ @ 161 NONAME ; int TPhoneCmdParamQuery::SendKeyEnabled(void) const
+	?SetTitlePaneResourceId@TPhoneCmdParamSingleItemFetch@@QAEXH@Z @ 162 NONAME ; void TPhoneCmdParamSingleItemFetch::SetTitlePaneResourceId(int)
+	?Find@CPhoneCenRepProxy@@QBEHABVTUid@@KKAAV?$RArray@K@@@Z @ 163 NONAME ; int CPhoneCenRepProxy::Find(class TUid const &, unsigned long, unsigned long, class RArray<unsigned long> &) const
+	?SetLabelText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 164 NONAME ; void TPhoneCmdParamCallHeaderData::SetLabelText(class TDesC16 const &)
+	?CNAPText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 165 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::CNAPText(void) const
+	?SetOwnPhoneNumberText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 166 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetOwnPhoneNumberText(class TDesC16 const &)
+	?Emergency@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 167 NONAME ; int TPhoneCmdParamIncallIndicatorData::Emergency(void) const
+	?SetCbaResourceId@TPhoneCmdParamSingleItemFetch@@QAEXH@Z @ 168 NONAME ; void TPhoneCmdParamSingleItemFetch::SetCbaResourceId(int)
+	?AppUid@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 169 NONAME ; class TUid TPhoneCmdParamAppInfo::AppUid(void) const
+	?CustomMessage@TPhoneCmdParamAppInfo@@QBEABVTDesC8@@XZ @ 170 NONAME ; class TDesC8 const & TPhoneCmdParamAppInfo::CustomMessage(void) const
+	?QueryResourceId@TPhoneCmdParamQuery@@QBEHXZ @ 171 NONAME ; int TPhoneCmdParamQuery::QueryResourceId(void) const
+	?SetRingTone@TPhoneCmdParamRingTone@@QAEXABVTDesC16@@@Z @ 172 NONAME ; void TPhoneCmdParamRingTone::SetRingTone(class TDesC16 const &)
+	?NotifyChangeL@CPhonePubSubProxy@@QAEXABVTUid@@IPAVMPhonePubSubObserver@@@Z @ 173 NONAME ; void CPhonePubSubProxy::NotifyChangeL(class TUid const &, unsigned int, class MPhonePubSubObserver *)
+	?SetEmergency@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 174 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetEmergency(int)
+	?SetDefaultCba@TPhoneCmdParamQuery@@QAEXH@Z @ 175 NONAME ; void TPhoneCmdParamQuery::SetDefaultCba(int)
+	?Type@TPhoneCmdParamTransEffect@@QBE?AW4TPhoneTransEffectType@@XZ @ 176 NONAME ; enum TPhoneTransEffectType TPhoneCmdParamTransEffect::Type(void) const
+	??0TPhoneCmdParamSfiData@@QAE@XZ @ 177 NONAME ; TPhoneCmdParamSfiData::TPhoneCmdParamSfiData(void)
+	??0TPhoneCmdParamCallHeaderData@@QAE@XZ @ 178 NONAME ; TPhoneCmdParamCallHeaderData::TPhoneCmdParamCallHeaderData(void)
+	??1CPhoneClearBlacklist@@UAE@XZ @ 179 NONAME ; CPhoneClearBlacklist::~CPhoneClearBlacklist(void)
+	?SetMute@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 180 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetMute(int)
+	?KeyCode@TPhoneCmdParamKeyCapture@@QBE?AW4TKeyCode@@XZ @ 181 NONAME ; enum TKeyCode TPhoneCmdParamKeyCapture::KeyCode(void) const
+	?IsNumberKey@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 182 NONAME ; int CPhoneKeys::IsNumberKey(struct TKeyEvent const &, enum TEventCode)
+	?TextResourceId@TPhoneCmdParamGlobalNote@@QBEHXZ @ 183 NONAME ; int TPhoneCmdParamGlobalNote::TextResourceId(void) const
+	?SetCiphering@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 184 NONAME ; void TPhoneCmdParamCallHeaderData::SetCiphering(int)
+	?EnablePreconditionL@CPhoneRecoverySystem@@QAEXXZ @ 185 NONAME ; void CPhoneRecoverySystem::EnablePreconditionL(void)
+	?AddL@CPhoneRecoverySystem@@QAEHVTCallBack@@CW4TRecoveryState@CTeleRecoverySystem@@@Z @ 186 NONAME ; int CPhoneRecoverySystem::AddL(class TCallBack, signed char, enum CTeleRecoverySystem::TRecoveryState)
+	?SetLine2@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 187 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetLine2(int)
+	?SetAudioOutput@TPhoneCmdParamAudioOutput@@QAEXW4TPEAudioOutput@@@Z @ 188 NONAME ; void TPhoneCmdParamAudioOutput::SetAudioOutput(enum TPEAudioOutput)
+	?HeaderText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 189 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::HeaderText(void) const
+	?CallImageThemeSettings@CPhoneCallThemeMonitor@@QBEHXZ @ 190 NONAME ; int CPhoneCallThemeMonitor::CallImageThemeSettings(void) const
+	?SetLocation@TPhoneCmdParamSpeedDial@@QAEXH@Z @ 191 NONAME ; void TPhoneCmdParamSpeedDial::SetLocation(int)
+	??0TPhoneCmdParamTransEffect@@QAE@XZ @ 192 NONAME ; TPhoneCmdParamTransEffect::TPhoneCmdParamTransEffect(void)
+	?Number@TPhoneCmdParamSfiData@@QBEABVTDesC16@@XZ @ 193 NONAME ; class TDesC16 const & TPhoneCmdParamSfiData::Number(void) const
+	?OwnPhoneNumberText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 194 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::OwnPhoneNumberText(void) const
+	?QueryPrompt@TPhoneCmdParamQuery@@QBEABVTDesC16@@XZ @ 195 NONAME ; class TDesC16 const & TPhoneCmdParamQuery::QueryPrompt(void) const
+	?SetQueryPrompt@TPhoneCmdParamQuery@@QAEXABVTDesC16@@@Z @ 196 NONAME ; void TPhoneCmdParamQuery::SetQueryPrompt(class TDesC16 const &)
+	?NewL@CPhoneQwertyHandler@@SAPAV1@XZ @ 197 NONAME ; class CPhoneQwertyHandler * CPhoneQwertyHandler::NewL(void)
+	?IsNumericKey@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 198 NONAME ; int CPhoneKeys::IsNumericKey(struct TKeyEvent const &, enum TEventCode)
+	?SetCaptureType@TPhoneCmdParamKeyCapture@@QAEXW4TPhoneCaptureType@@@Z @ 199 NONAME ; void TPhoneCmdParamKeyCapture::SetCaptureType(enum TPhoneCaptureType)
+	?ViewUid@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 200 NONAME ; class TUid TPhoneCmdParamAppInfo::ViewUid(void) const
+	?CallFlag@TPhoneCmdParamCallHeaderData@@QBEKXZ @ 201 NONAME ; unsigned long TPhoneCmdParamCallHeaderData::CallFlag(void) const
+	?SetLabelText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 202 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetLabelText(class TDesC16 const &)
+	??0TPhoneCmdParamSpeedDial@@QAE@XZ @ 203 NONAME ; TPhoneCmdParamSpeedDial::TPhoneCmdParamSpeedDial(void)
+	?IsCallerText@TPhoneCmdParamRingTone@@QAEHXZ @ 204 NONAME ; int TPhoneCmdParamRingTone::IsCallerText(void)
+	?SetBitmap@TPhoneCmdParamBitmap@@QAEXPAVCFbsBitmap@@@Z @ 205 NONAME ; void TPhoneCmdParamBitmap::SetBitmap(class CFbsBitmap *)
+	?SetNumber@TPhoneCmdParamSfiData@@QAEXABVTDesC16@@@Z @ 206 NONAME ; void TPhoneCmdParamSfiData::SetNumber(class TDesC16 const &)
+	?Location@TPhoneCmdParamSpeedDial@@QAEHXZ @ 207 NONAME ; int TPhoneCmdParamSpeedDial::Location(void)
+	?CipheringIndicatorAllowed@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 208 NONAME ; int TPhoneCmdParamCallHeaderData::CipheringIndicatorAllowed(void) const
+	?Name@TPhoneCmdParamSfiData@@QBEABVTDesC16@@XZ @ 209 NONAME ; class TDesC16 const & TPhoneCmdParamSfiData::Name(void) const
+	??0TPhoneCmdParamQuery@@QAE@ABV0@@Z @ 210 NONAME ; TPhoneCmdParamQuery::TPhoneCmdParamQuery(class TPhoneCmdParamQuery const &)
+	?CallState@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 211 NONAME ; int TPhoneCmdParamCallHeaderData::CallState(void) const
+	??0TPhoneCmdParamIncallIndicatorData@@QAE@XZ @ 212 NONAME ; TPhoneCmdParamIncallIndicatorData::TPhoneCmdParamIncallIndicatorData(void)
+	?Picture@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 213 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::Picture(void) const
+	?SetCallThemeSettingsObserver@CPhoneCallThemeMonitor@@QAEXPAVMPhoneCallThemeSettingsObserver@@@Z @ 214 NONAME ; void CPhoneCallThemeMonitor::SetCallThemeSettingsObserver(class MPhoneCallThemeSettingsObserver *)
+	?ServiceId@TPhoneCmdParamCallHeaderData@@QBEKXZ @ 215 NONAME ; unsigned long TPhoneCmdParamCallHeaderData::ServiceId(void) const
+	?LabelText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 216 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::LabelText(void) const
+	?Overflow@CPhoneLogger@@EAEXAAVTDes16@@@Z @ 217 NONAME ; void CPhoneLogger::Overflow(class TDes16 &)
+	?SetServiceId@TPhoneCmdParamSpeedDial@@QAEXI@Z @ 218 NONAME ; void TPhoneCmdParamSpeedDial::SetServiceId(unsigned int)
+	?SetKeyEvent@TPhoneCmdParamKeyEvent@@QAEXABUTKeyEvent@@@Z @ 219 NONAME ; void TPhoneCmdParamKeyEvent::SetKeyEvent(struct TKeyEvent const &)
+	?Instance@CPhonePubSubProxy@@SAPAV1@XZ @ 220 NONAME ; class CPhonePubSubProxy * CPhonePubSubProxy::Instance(void)
+	?ResourceId@TPhoneCmdParamNote@@QBEHXZ @ 221 NONAME ; int TPhoneCmdParamNote::ResourceId(void) const
+	?CipheringIndicatorAllowed@TPhoneCmdParamEmergencyCallHeaderData@@QBEHXZ @ 222 NONAME ; int TPhoneCmdParamEmergencyCallHeaderData::CipheringIndicatorAllowed(void) const
+	?CancelAllNotifies@CPhoneCenRepProxy@@SAXPAVMPhoneCenRepObserver@@@Z @ 223 NONAME ; void CPhoneCenRepProxy::CancelAllNotifies(class MPhoneCenRepObserver *)
+	??1CPhoneQwertyHandler@@UAE@XZ @ 224 NONAME ; CPhoneQwertyHandler::~CPhoneQwertyHandler(void)
+	?TextResourceId@TPhoneCmdParamNote@@QBEHXZ @ 225 NONAME ; int TPhoneCmdParamNote::TextResourceId(void) const
+	?SetRemotePhoneNumber@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 226 NONAME ; void TPhoneCmdParamCallHeaderData::SetRemotePhoneNumber(class TDesC16 const &)
+	?CipheringIndicatorAllowed@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 227 NONAME ; int TPhoneCmdParamIncallIndicatorData::CipheringIndicatorAllowed(void) const
+	??0TPhoneCmdParamCallStateData@@QAE@XZ @ 228 NONAME ; TPhoneCmdParamCallStateData::TPhoneCmdParamCallStateData(void)
+	?SetKeyCode@TPhoneCmdParamKeyCapture@@QAEXW4TKeyCode@@@Z @ 229 NONAME ; void TPhoneCmdParamKeyCapture::SetKeyCode(enum TKeyCode)
+	?CustomMessageId@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 230 NONAME ; class TUid TPhoneCmdParamAppInfo::CustomMessageId(void) const
+	?RemotePhoneNumber@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 231 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::RemotePhoneNumber(void) const
+	?SetType@TPhoneCmdParamNote@@QAEXW4TPhoneNoteType@@@Z @ 232 NONAME ; void TPhoneCmdParamNote::SetType(enum TPhoneNoteType)
+	?Instance@CPhoneClearBlacklist@@SAPAV1@XZ @ 233 NONAME ; class CPhoneClearBlacklist * CPhoneClearBlacklist::Instance(void)
+	?TextToSay@TPhoneCmdParamRingTone@@QBEABVTDesC16@@XZ @ 234 NONAME ; class TDesC16 const & TPhoneCmdParamRingTone::TextToSay(void) const
+	?Type@TPhoneCmdParamNote@@QBE?AW4TPhoneNoteType@@XZ @ 235 NONAME ; enum TPhoneNoteType TPhoneCmdParamNote::Type(void) const
+	??0TPhoneCmdParamReconnectQuery@@QAE@AAVMCaUiReconnectQueryObserver@@@Z @ 236 NONAME ; TPhoneCmdParamReconnectQuery::TPhoneCmdParamReconnectQuery(class MCaUiReconnectQueryObserver &)
+	?SetCallFlag@TPhoneCmdParamCallHeaderData@@QAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 237 NONAME ; void TPhoneCmdParamCallHeaderData::SetCallFlag(enum CBubbleManager::TPhoneCallTypeFlags)
+	?SetPicture@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 238 NONAME ; void TPhoneCmdParamCallHeaderData::SetPicture(class TDesC16 const &)
+	?Integer@TPhoneCmdParamInteger@@QBEHXZ @ 239 NONAME ; int TPhoneCmdParamInteger::Integer(void) const
+	?Mode@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 240 NONAME ; int TPhoneCmdParamIncallIndicatorData::Mode(void) const
+	?SetText@TPhoneCmdParamNote@@QAEXABVTDesC16@@@Z @ 241 NONAME ; void TPhoneCmdParamNote::SetText(class TDesC16 const &)
+	?SetCallerTextStatus@TPhoneCmdParamRingTone@@QAEXH@Z @ 242 NONAME ; void TPhoneCmdParamRingTone::SetCallerTextStatus(int)
+	?IsWiredAccAvailable@TPhoneCmdParamAudioAvailability@@QBEHXZ @ 243 NONAME ; int TPhoneCmdParamAudioAvailability::IsWiredAccAvailable(void) const
+	?SetWaitForReady@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 244 NONAME ; void TPhoneCmdParamGlobalNote::SetWaitForReady(int)
+	??0TPhoneCmdParamBoolean@@QAE@XZ @ 245 NONAME ; TPhoneCmdParamBoolean::TPhoneCmdParamBoolean(void)
+	?QueryCommandObserver@TPhoneCmdParamQuery@@QAEPAVMPhoneQueryCommandObserver@@XZ @ 246 NONAME ; class MPhoneQueryCommandObserver * TPhoneCmdParamQuery::QueryCommandObserver(void)
+	?DataText@TPhoneCmdParamQuery@@QBEPAVTDes16@@XZ @ 247 NONAME ; class TDes16 * TPhoneCmdParamQuery::DataText(void) const
+	?SetType@TPhoneCmdParamSingleItemFetch@@QAEXW4TFetchType@CPhCntSingleItemFetch@@@Z @ 248 NONAME ; void TPhoneCmdParamSingleItemFetch::SetType(enum CPhCntSingleItemFetch::TFetchType)
+	?SetReal@CPhoneCenRepProxy@@QAEHABVTUid@@IN@Z @ 249 NONAME ; int CPhoneCenRepProxy::SetReal(class TUid const &, unsigned int, double)
+	??0TPhoneCmdParamCustomDialer@@QAE@XZ @ 250 NONAME ; TPhoneCmdParamCustomDialer::TPhoneCmdParamCustomDialer(void)
+	??1CPhonePubSubProxy@@UAE@XZ @ 251 NONAME ; CPhonePubSubProxy::~CPhonePubSubProxy(void)
+	?NumericKeyCode@CPhoneQwertyHandler@@QAEHABUTKeyEvent@@@Z @ 252 NONAME ; int CPhoneQwertyHandler::NumericKeyCode(struct TKeyEvent const &)
+	?SetMessageData@TPhoneCmdParamMessageEditor@@QAEXPAVCMessageData@@@Z @ 253 NONAME ; void TPhoneCmdParamMessageEditor::SetMessageData(class CMessageData *)
+	??0TPhoneCmdParamNote@@QAE@XZ @ 254 NONAME ; TPhoneCmdParamNote::TPhoneCmdParamNote(void)
+	?Volume@TPhoneCmdParamRingTone@@QBEHXZ @ 255 NONAME ; int TPhoneCmdParamRingTone::Volume(void) const
+	?SetItemTextArrayForListQuery@TPhoneCmdParamQuery@@QAEXAAVMDesC16Array@@@Z @ 256 NONAME ; void TPhoneCmdParamQuery::SetItemTextArrayForListQuery(class MDesC16Array &)
+	?Type@TPhoneCmdParamRingTone@@QBE?AW4TPhoneRingToneType@@XZ @ 257 NONAME ; enum TPhoneRingToneType TPhoneCmdParamRingTone::Type(void) const
+	?Key@TPhoneCmdParamKeyCapture@@QBE?AW4TStdScanCode@@XZ @ 258 NONAME ; enum TStdScanCode TPhoneCmdParamKeyCapture::Key(void) const
+	?LabelText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 259 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::LabelText(void) const
+	?Ciphering@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 260 NONAME ; int TPhoneCmdParamIncallIndicatorData::Ciphering(void) const
+	?SetQueryCommandObserver@TPhoneCmdParamQuery@@QAEXAAVMPhoneQueryCommandObserver@@@Z @ 261 NONAME ; void TPhoneCmdParamQuery::SetQueryCommandObserver(class MPhoneQueryCommandObserver &)
+	?IsPhoneUIFeatureSupported@CPhoneCenRepProxy@@QAEHH@Z @ 262 NONAME ; int CPhoneCenRepProxy::IsPhoneUIFeatureSupported(int)
+	?DefaultCba@TPhoneCmdParamQuery@@QBEHXZ @ 263 NONAME ; int TPhoneCmdParamQuery::DefaultCba(void) const
+	?CallState@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 264 NONAME ; int TPhoneCmdParamIncallIndicatorData::CallState(void) const
+	??0TPhoneCmdParamNumberEntryObserver@@QAE@XZ @ 265 NONAME ; TPhoneCmdParamNumberEntryObserver::TPhoneCmdParamNumberEntryObserver(void)
+	?MessageData@TPhoneCmdParamMessageEditor@@QBEPAVCMessageData@@XZ @ 266 NONAME ; class CMessageData * TPhoneCmdParamMessageEditor::MessageData(void) const
+	?SetLine2@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 267 NONAME ; void TPhoneCmdParamCallHeaderData::SetLine2(int)
+	?FetchValuesFromCenRepL@CPhoneCenRepProxy@@QAEXAAVTPhoneCmdParamAppInfo@@W4TKeyCode@@PAVHBufC8@@AAH@Z @ 268 NONAME ; void CPhoneCenRepProxy::FetchValuesFromCenRepL(class TPhoneCmdParamAppInfo &, enum TKeyCode, class HBufC8 *, int &)
+	?CNAPTextClippingDirection@TPhoneCmdParamCallHeaderData@@QBE?AW4TPhoneClippingDirection@CBubbleManager@@XZ @ 269 NONAME ; enum CBubbleManager::TPhoneClippingDirection TPhoneCmdParamCallHeaderData::CNAPTextClippingDirection(void) const
+	?ParticipantCLI@TPhoneCmdParamCallHeaderData@@QBE?AW4TPhoneParticipantListCLI@1@XZ @ 270 NONAME ; enum TPhoneCmdParamCallHeaderData::TPhoneParticipantListCLI TPhoneCmdParamCallHeaderData::ParticipantCLI(void) const
+	?Thumbnail@TPhoneCmdParamCallHeaderData@@QBEPAVCFbsBitmap@@XZ @ 271 NONAME ; class CFbsBitmap * TPhoneCmdParamCallHeaderData::Thumbnail(void) const
+	?SetTimeOut@TPhoneCmdParamQuery@@QAEXH@Z @ 272 NONAME ; void TPhoneCmdParamQuery::SetTimeOut(int)
+	?Boolean@TPhoneCmdParamBoolean@@QBEHXZ @ 273 NONAME ; int TPhoneCmdParamBoolean::Boolean(void) const
+	?LogMsgFromPhoneUIToPE@CPhoneLogger@@QAEXHH@Z @ 274 NONAME ; void CPhoneLogger::LogMsgFromPhoneUIToPE(int, int)
+	?SetCustomMessageId@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 275 NONAME ; void TPhoneCmdParamAppInfo::SetCustomMessageId(class TUid const &)
+	?ResolveResourceID@CPhoneResourceResolverBase@@UBEHABH@Z @ 276 NONAME ; int CPhoneResourceResolverBase::ResolveResourceID(int const &) const
+	?SetName@TPhoneCmdParamSfiData@@QAEXABVTDesC16@@@Z @ 277 NONAME ; void TPhoneCmdParamSfiData::SetName(class TDesC16 const &)
+	?TitlePaneResourceId@TPhoneCmdParamSingleItemFetch@@QBEHXZ @ 278 NONAME ; int TPhoneCmdParamSingleItemFetch::TitlePaneResourceId(void) const
+	?SetType@TPhoneCmdParamGlobalNote@@QAEXW4TAknGlobalNoteType@@@Z @ 279 NONAME ; void TPhoneCmdParamGlobalNote::SetType(enum TAknGlobalNoteType)
+	?IncludeVideoCallOption@TPhoneCmdParamReconnectQuery@@QBEHXZ @ 280 NONAME ; int TPhoneCmdParamReconnectQuery::IncludeVideoCallOption(void) const
+	?SetLittleBubbleVisible@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 281 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetLittleBubbleVisible(int)
+	?Ciphering@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 282 NONAME ; int TPhoneCmdParamCallHeaderData::Ciphering(void) const
+	?SetType@TPhoneCmdParamRingTone@@QAEXW4TPhoneRingToneType@@@Z @ 283 NONAME ; void TPhoneCmdParamRingTone::SetType(enum TPhoneRingToneType)
+	?ResourceId@TPhoneCmdParamDynMenu@@QBEHXZ @ 284 NONAME ; int TPhoneCmdParamDynMenu::ResourceId(void) const
+	?SetCipheringIndicatorAllowed@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 285 NONAME ; void TPhoneCmdParamCallHeaderData::SetCipheringIndicatorAllowed(int)
+	?SetWaitTime@TPhoneCmdParamProgressNote@@QAEXVTTimeIntervalMicroSeconds32@@@Z @ 286 NONAME ; void TPhoneCmdParamProgressNote::SetWaitTime(class TTimeIntervalMicroSeconds32)
+	?Ciphering@TPhoneCmdParamEmergencyCallHeaderData@@QBEHXZ @ 287 NONAME ; int TPhoneCmdParamEmergencyCallHeaderData::Ciphering(void) const
+	??1CPhoneCallThemeMonitor@@UAE@XZ @ 288 NONAME ; CPhoneCallThemeMonitor::~CPhoneCallThemeMonitor(void)
+	?SetNumberType@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 289 NONAME ; void TPhoneCmdParamCallHeaderData::SetNumberType(int)
+	?Mute@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 290 NONAME ; int TPhoneCmdParamIncallIndicatorData::Mute(void) const
+	?IsQwertyInput@CPhoneQwertyHandler@@QBEHXZ @ 291 NONAME ; int CPhoneQwertyHandler::IsQwertyInput(void) const
+	?SetBoolean@TPhoneCmdParamBoolean@@QAEXH@Z @ 292 NONAME ; void TPhoneCmdParamBoolean::SetBoolean(int)
+	?IsTelephonyFeatureSupported@CPhoneResourceResolverBase@@MBEHH@Z @ 293 NONAME ; int CPhoneResourceResolverBase::IsTelephonyFeatureSupported(int) const
+	?Instance@CPhoneMainErrorMessagesHandler@@SAPAV1@XZ @ 294 NONAME ; class CPhoneMainErrorMessagesHandler * CPhoneMainErrorMessagesHandler::Instance(void)
+	?SetViewUid@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 295 NONAME ; void TPhoneCmdParamAppInfo::SetViewUid(class TUid const &)
+	?SetServiceId@TPhoneCmdParamCallHeaderData@@QAEXK@Z @ 296 NONAME ; void TPhoneCmdParamCallHeaderData::SetServiceId(unsigned long)
+	?Instance@CPhoneCenRepProxy@@SAPAV1@XZ @ 297 NONAME ; class CPhoneCenRepProxy * CPhoneCenRepProxy::Instance(void)
+	?AddCallFlag@TPhoneCmdParamCallHeaderData@@QAEXW4TPhoneCallTypeFlags@CBubbleManager@@@Z @ 298 NONAME ; void TPhoneCmdParamCallHeaderData::AddCallFlag(enum CBubbleManager::TPhoneCallTypeFlags)
+	?SetQueryType@TPhoneCmdParamQuery@@QAEXW4TPhoneQueryType@@@Z @ 299 NONAME ; void TPhoneCmdParamQuery::SetQueryType(enum TPhoneQueryType)
+	?Value@CPhonePubSubProxy@@QAEHABVTUid@@I@Z @ 300 NONAME ; int CPhonePubSubProxy::Value(class TUid const &, unsigned int)
+	?SetWiredAccAvailable@TPhoneCmdParamAudioAvailability@@QAEXH@Z @ 301 NONAME ; void TPhoneCmdParamAudioAvailability::SetWiredAccAvailable(int)
+	?SetString@TPhoneCmdParamSingleItemFetch@@QAEXPAVTDes16@@@Z @ 302 NONAME ; void TPhoneCmdParamSingleItemFetch::SetString(class TDes16 *)
+	??0TPhoneCmdParamAudioOutput@@QAE@XZ @ 303 NONAME ; TPhoneCmdParamAudioOutput::TPhoneCmdParamAudioOutput(void)
+	?IsCallerImage@TPhoneCmdParamRingTone@@QAEHXZ @ 304 NONAME ; int TPhoneCmdParamRingTone::IsCallerImage(void)
+	??0TPhoneCmdParamQuery@@QAE@XZ @ 305 NONAME ; TPhoneCmdParamQuery::TPhoneCmdParamQuery(void)
+	?Instance@CPhoneMainResourceResolver@@SAPAV1@XZ @ 306 NONAME ; class CPhoneMainResourceResolver * CPhoneMainResourceResolver::Instance(void)
+	?ServiceId@TPhoneCmdParamSpeedDial@@QBEIXZ @ 307 NONAME ; unsigned int TPhoneCmdParamSpeedDial::ServiceId(void) const
+	?SetPhoneNumber@TPhoneCmdParamReconnectQuery@@QAEXVTPtrC16@@@Z @ 308 NONAME ; void TPhoneCmdParamReconnectQuery::SetPhoneNumber(class TPtrC16)
+	??1CPhoneLibraryContainer@@UAE@XZ @ 309 NONAME ; CPhoneLibraryContainer::~CPhoneLibraryContainer(void)
+	?ClearBlackListOnNextKey@CPhoneClearBlacklist@@QAEXXZ @ 310 NONAME ; void CPhoneClearBlacklist::ClearBlackListOnNextKey(void)
+	?Tone@TPhoneCmdParamQuery@@QBEHXZ @ 311 NONAME ; int TPhoneCmdParamQuery::Tone(void) const
+	?SetNumberType@TPhoneCmdParamSpeedDial@@QAEXW4TPhoneNumberType@@@Z @ 312 NONAME ; void TPhoneCmdParamSpeedDial::SetNumberType(enum TPhoneNumberType)
+	?SetRingingType@TPhoneCmdParamRingTone@@QAEXH@Z @ 313 NONAME ; void TPhoneCmdParamRingTone::SetRingingType(int)
+	?CbaResourceId@TPhoneCmdParamSingleItemFetch@@QBEHXZ @ 314 NONAME ; int TPhoneCmdParamSingleItemFetch::CbaResourceId(void) const
+	?SetCiphering@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 315 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCiphering(int)
+	?SetCipheringIndicatorAllowed@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 316 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCipheringIndicatorAllowed(int)
+	?AudioOutput@TPhoneCmdParamAudioOutput@@QBE?AW4TPEAudioOutput@@XZ @ 317 NONAME ; enum TPEAudioOutput TPhoneCmdParamAudioOutput::AudioOutput(void) const
+	?SetResourceId@TPhoneCmdParamProgressNote@@QAEXH@Z @ 318 NONAME ; void TPhoneCmdParamProgressNote::SetResourceId(int)
+	??0TPhoneCmdParamInteger@@QAE@XZ @ 319 NONAME ; TPhoneCmdParamInteger::TPhoneCmdParamInteger(void)
+	?Type@TPhoneCmdParamSingleItemFetch@@QAE?AW4TFetchType@CPhCntSingleItemFetch@@XZ @ 320 NONAME ; enum CPhCntSingleItemFetch::TFetchType TPhoneCmdParamSingleItemFetch::Type(void)
+	?SetType@TPhoneCmdParamTransEffect@@QAEXW4TPhoneTransEffectType@@@Z @ 321 NONAME ; void TPhoneCmdParamTransEffect::SetType(enum TPhoneTransEffectType)
+	?Bitmap@TPhoneCmdParamBitmap@@QBEPAVCFbsBitmap@@XZ @ 322 NONAME ; class CFbsBitmap * TPhoneCmdParamBitmap::Bitmap(void) const
+	?SetTone@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 323 NONAME ; void TPhoneCmdParamGlobalNote::SetTone(int)
+	?After@CPhoneTimer@@QAEXVTTimeIntervalMicroSeconds32@@VTCallBack@@@Z @ 324 NONAME ; void CPhoneTimer::After(class TTimeIntervalMicroSeconds32, class TCallBack)
+	?ContactMatcher@TPhoneCmdParamReconnectQuery@@QBEPAVCPhCntMatcher@@XZ @ 325 NONAME ; class CPhCntMatcher * TPhoneCmdParamReconnectQuery::ContactMatcher(void) const
 
--- a/phoneapp/phoneuiutils/eabi/phoneuiutilsu.def	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiutils/eabi/phoneuiutilsu.def	Mon Mar 15 12:40:24 2010 +0200
@@ -26,418 +26,394 @@
 	_ZN12CPhoneLoggerD0Ev @ 25 NONAME
 	_ZN12CPhoneLoggerD1Ev @ 26 NONAME
 	_ZN12CPhoneLoggerD2Ev @ 27 NONAME
-	_ZN13CPhoneStorage14IsScreenLockedEv @ 28 NONAME
-	_ZN13CPhoneStorage15SetScreenLockedEi @ 29 NONAME
-	_ZN13CPhoneStorage19NeedToEnableKeylockEv @ 30 NONAME
-	_ZN13CPhoneStorage20ResetBlockedKeysListEv @ 31 NONAME
-	_ZN13CPhoneStorage22AppendBlockedKeysListLE12TStdScanCode @ 32 NONAME
-	_ZN13CPhoneStorage22IsBlockedKeysListEmptyEv @ 33 NONAME
-	_ZN13CPhoneStorage22SetNeedToEnableKeylockEi @ 34 NONAME
-	_ZN13CPhoneStorage4NewLEv @ 35 NONAME
-	_ZN13CPhoneStorageD0Ev @ 36 NONAME
-	_ZN13CPhoneStorageD1Ev @ 37 NONAME
-	_ZN13CPhoneStorageD2Ev @ 38 NONAME
-	_ZN17CPhoneCenRepProxy12CancelNotifyEP20MPhoneCenRepObserverj @ 39 NONAME
-	_ZN17CPhoneCenRepProxy13NotifyChangeLERK4TUidjP20MPhoneCenRepObserver @ 40 NONAME
-	_ZN17CPhoneCenRepProxy17CancelAllNotifiesEP20MPhoneCenRepObserver @ 41 NONAME
-	_ZN17CPhoneCenRepProxy22FetchValuesFromCenRepLER21TPhoneCmdParamAppInfo8TKeyCodeP6HBufC8Ri @ 42 NONAME
-	_ZN17CPhoneCenRepProxy25IsPhoneUIFeatureSupportedEi @ 43 NONAME
-	_ZN17CPhoneCenRepProxy27IsTelephonyFeatureSupportedEi @ 44 NONAME
-	_ZN17CPhoneCenRepProxy6SetIntERK4TUidji @ 45 NONAME
-	_ZN17CPhoneCenRepProxy7SetRealERK4TUidjd @ 46 NONAME
-	_ZN17CPhoneCenRepProxy8InstanceEv @ 47 NONAME
-	_ZN17CPhoneCenRepProxy9SetStringERK4TUidjRK7TDesC16 @ 48 NONAME
-	_ZN17CPhoneCenRepProxyD0Ev @ 49 NONAME
-	_ZN17CPhoneCenRepProxyD1Ev @ 50 NONAME
-	_ZN17CPhoneCenRepProxyD2Ev @ 51 NONAME
-	_ZN17CPhonePubSubProxy13NotifyChangeLERK4TUidjP20MPhonePubSubObserver @ 52 NONAME
-	_ZN17CPhonePubSubProxy19ChangePropertyValueERK4TUidji @ 53 NONAME
-	_ZN17CPhonePubSubProxy22CancelAllNotificationsEP20MPhonePubSubObserver @ 54 NONAME
-	_ZN17CPhonePubSubProxy5ValueERK4TUidj @ 55 NONAME
-	_ZN17CPhonePubSubProxy8InstanceEv @ 56 NONAME
-	_ZN17CPhonePubSubProxyD0Ev @ 57 NONAME
-	_ZN17CPhonePubSubProxyD1Ev @ 58 NONAME
-	_ZN17CPhonePubSubProxyD2Ev @ 59 NONAME
-	_ZN18CPhoneMethodLoggerC1E24TPhoneUILoggingComponent7TPtrC16 @ 60 NONAME
-	_ZN18CPhoneMethodLoggerC2E24TPhoneUILoggingComponent7TPtrC16 @ 61 NONAME
-	_ZN18CPhoneMethodLoggerD0Ev @ 62 NONAME
-	_ZN18CPhoneMethodLoggerD1Ev @ 63 NONAME
-	_ZN18CPhoneMethodLoggerD2Ev @ 64 NONAME
-	_ZN18TPhoneCmdParamNote10SetTimeoutEN14CAknNoteDialog8TTimeoutE @ 65 NONAME
-	_ZN18TPhoneCmdParamNote13SetResourceIdEi @ 66 NONAME
-	_ZN18TPhoneCmdParamNote17SetTextResourceIdEi @ 67 NONAME
-	_ZN18TPhoneCmdParamNote7SetTextERK7TDesC16 @ 68 NONAME
-	_ZN18TPhoneCmdParamNote7SetToneEN14CAknNoteDialog5TToneE @ 69 NONAME
-	_ZN18TPhoneCmdParamNote7SetTypeE14TPhoneNoteType @ 70 NONAME
-	_ZN18TPhoneCmdParamNoteC1Ev @ 71 NONAME
-	_ZN18TPhoneCmdParamNoteC2Ev @ 72 NONAME
-	_ZN18TPhoneCommandParamC1Ev @ 73 NONAME
-	_ZN18TPhoneCommandParamC2Ev @ 74 NONAME
-	_ZN19CPhoneQwertyHandler14NumericKeyCodeERK9TKeyEvent @ 75 NONAME
-	_ZN19CPhoneQwertyHandler4NewLEv @ 76 NONAME
-	_ZN19CPhoneQwertyHandlerD0Ev @ 77 NONAME
-	_ZN19CPhoneQwertyHandlerD1Ev @ 78 NONAME
-	_ZN19CPhoneQwertyHandlerD2Ev @ 79 NONAME
-	_ZN19TPhoneCmdParamQuery10SetTimeOutEi @ 80 NONAME
-	_ZN19TPhoneCmdParamQuery11SetDataTextEP6TDes16 @ 81 NONAME
-	_ZN19TPhoneCmdParamQuery12SetQueryTypeE15TPhoneQueryType @ 82 NONAME
-	_ZN19TPhoneCmdParamQuery13SetContentCbaEi @ 83 NONAME
-	_ZN19TPhoneCmdParamQuery13SetDefaultCbaEi @ 84 NONAME
-	_ZN19TPhoneCmdParamQuery14SetQueryPromptERK7TDesC16 @ 85 NONAME
-	_ZN19TPhoneCmdParamQuery17SetCommandParamIdEN18TPhoneCommandParam13TPhoneParamIdE @ 86 NONAME
-	_ZN19TPhoneCmdParamQuery17SetSendKeyEnabledEi @ 87 NONAME
-	_ZN19TPhoneCmdParamQuery18SetQueryResourceIdEi @ 88 NONAME
-	_ZN19TPhoneCmdParamQuery20QueryCommandObserverEv @ 89 NONAME
-	_ZN19TPhoneCmdParamQuery20SetCbaCommandMappingEii @ 90 NONAME
-	_ZN19TPhoneCmdParamQuery23SetQueryCommandObserverER26MPhoneQueryCommandObserver @ 91 NONAME
-	_ZN19TPhoneCmdParamQuery26SetCustomCommandForTimeOutEi @ 92 NONAME
-	_ZN19TPhoneCmdParamQuery28SetItemTextArrayForListQueryER12MDesC16Array @ 93 NONAME
-	_ZN19TPhoneCmdParamQuery7SetToneEi @ 94 NONAME
-	_ZN19TPhoneCmdParamQueryC1ERKS_ @ 95 NONAME
-	_ZN19TPhoneCmdParamQueryC1Ev @ 96 NONAME
-	_ZN19TPhoneCmdParamQueryC2ERKS_ @ 97 NONAME
-	_ZN19TPhoneCmdParamQueryC2Ev @ 98 NONAME
-	_ZN19TPhoneCmdParamQueryaSERKS_ @ 99 NONAME
-	_ZN20CPhoneClearBlacklist17ClearBlackListNowEv @ 100 NONAME
-	_ZN20CPhoneClearBlacklist23ClearBlackListOnNextKeyEv @ 101 NONAME
-	_ZN20CPhoneClearBlacklist7CreateLER10RWsSessionRK11RWindowBase @ 102 NONAME
-	_ZN20CPhoneClearBlacklist8InstanceEv @ 103 NONAME
-	_ZN20CPhoneClearBlacklistD0Ev @ 104 NONAME
-	_ZN20CPhoneClearBlacklistD1Ev @ 105 NONAME
-	_ZN20CPhoneClearBlacklistD2Ev @ 106 NONAME
-	_ZN20CPhoneRecoverySystem10RecoverNowEiai @ 107 NONAME
-	_ZN20CPhoneRecoverySystem19EnablePreconditionLEv @ 108 NONAME
-	_ZN20CPhoneRecoverySystem4AddLE9TCallBackaN19CTeleRecoverySystem14TRecoveryStateE @ 109 NONAME
-	_ZN20CPhoneRecoverySystem6RemoveEi @ 110 NONAME
-	_ZN20CPhoneRecoverySystem8InstanceEv @ 111 NONAME
-	_ZN20TPhoneCmdParamBitmap13SetMaskBitmapEP10CFbsBitmap @ 112 NONAME
-	_ZN20TPhoneCmdParamBitmap9SetBitmapEP10CFbsBitmap @ 113 NONAME
-	_ZN20TPhoneCmdParamBitmapC1Ev @ 114 NONAME
-	_ZN20TPhoneCmdParamBitmapC2Ev @ 115 NONAME
-	_ZN20TPhoneCmdParamString6StringEv @ 116 NONAME
-	_ZN20TPhoneCmdParamString9SetStringEP6TPtr16 @ 117 NONAME
-	_ZN20TPhoneCmdParamStringC1Ev @ 118 NONAME
-	_ZN20TPhoneCmdParamStringC2Ev @ 119 NONAME
-	_ZN21TPhoneCmdParamAppInfo10SetViewUidERK4TUid @ 120 NONAME
-	_ZN21TPhoneCmdParamAppInfo16SetCustomMessageERK6TDesC8 @ 121 NONAME
-	_ZN21TPhoneCmdParamAppInfo18SetCustomMessageIdERK4TUid @ 122 NONAME
-	_ZN21TPhoneCmdParamAppInfo20SetMultipleInstancesEi @ 123 NONAME
-	_ZN21TPhoneCmdParamAppInfo8SetParamERK6TDesC8 @ 124 NONAME
-	_ZN21TPhoneCmdParamAppInfo9SetAppUidERK4TUid @ 125 NONAME
-	_ZN21TPhoneCmdParamAppInfoC1Ev @ 126 NONAME
-	_ZN21TPhoneCmdParamAppInfoC2Ev @ 127 NONAME
-	_ZN21TPhoneCmdParamBoolean10SetBooleanEi @ 128 NONAME
-	_ZN21TPhoneCmdParamBooleanC1Ev @ 129 NONAME
-	_ZN21TPhoneCmdParamBooleanC2Ev @ 130 NONAME
-	_ZN21TPhoneCmdParamDynMenu10SetDynMenuEPv @ 131 NONAME
-	_ZN21TPhoneCmdParamDynMenu13SetResourceIdEi @ 132 NONAME
-	_ZN21TPhoneCmdParamDynMenu7DynMenuEv @ 133 NONAME
-	_ZN21TPhoneCmdParamDynMenuC1Ev @ 134 NONAME
-	_ZN21TPhoneCmdParamDynMenuC2Ev @ 135 NONAME
-	_ZN21TPhoneCmdParamInteger10SetIntegerEi @ 136 NONAME
-	_ZN21TPhoneCmdParamIntegerC1Ev @ 137 NONAME
-	_ZN21TPhoneCmdParamIntegerC2Ev @ 138 NONAME
-	_ZN21TPhoneCmdParamPointer10SetPointerEPv @ 139 NONAME
-	_ZN21TPhoneCmdParamPointerC1Ev @ 140 NONAME
-	_ZN21TPhoneCmdParamPointerC2Ev @ 141 NONAME
-	_ZN21TPhoneCmdParamSfiData7SetNameERK7TDesC16 @ 142 NONAME
-	_ZN21TPhoneCmdParamSfiData9SetNumberERK7TDesC16 @ 143 NONAME
-	_ZN21TPhoneCmdParamSfiDataC1Ev @ 144 NONAME
-	_ZN21TPhoneCmdParamSfiDataC2Ev @ 145 NONAME
-	_ZN22CPhoneCallThemeMonitor28SetCallThemeSettingsObserverEP31MPhoneCallThemeSettingsObserver @ 146 NONAME
-	_ZN22CPhoneCallThemeMonitor4NewLEv @ 147 NONAME
-	_ZN22CPhoneCallThemeMonitorD0Ev @ 148 NONAME
-	_ZN22CPhoneCallThemeMonitorD1Ev @ 149 NONAME
-	_ZN22CPhoneCallThemeMonitorD2Ev @ 150 NONAME
-	_ZN22CPhoneLibraryContainer11AddLibraryLERK8RLibrary @ 151 NONAME
-	_ZN22CPhoneLibraryContainer4NewLEv @ 152 NONAME
-	_ZN22CPhoneLibraryContainerD0Ev @ 153 NONAME
-	_ZN22CPhoneLibraryContainerD1Ev @ 154 NONAME
-	_ZN22CPhoneLibraryContainerD2Ev @ 155 NONAME
-	_ZN22TPhoneCmdParamKeyEvent11SetKeyEventERK9TKeyEvent @ 156 NONAME
-	_ZN22TPhoneCmdParamKeyEvent12SetEventCodeE10TEventCode @ 157 NONAME
-	_ZN22TPhoneCmdParamKeyEventC1Ev @ 158 NONAME
-	_ZN22TPhoneCmdParamKeyEventC2Ev @ 159 NONAME
-	_ZN22TPhoneCmdParamRingTone11SetRingToneERK7TDesC16 @ 160 NONAME
-	_ZN22TPhoneCmdParamRingTone12IsCallerTextEv @ 161 NONAME
-	_ZN22TPhoneCmdParamRingTone12SetTextToSayERK7TDesC16 @ 162 NONAME
-	_ZN22TPhoneCmdParamRingTone13IsCallerImageEv @ 163 NONAME
-	_ZN22TPhoneCmdParamRingTone14SetRingingTypeEi @ 164 NONAME
-	_ZN22TPhoneCmdParamRingTone19SetCallerTextStatusEi @ 165 NONAME
-	_ZN22TPhoneCmdParamRingTone20SetCallerImageStatusEi @ 166 NONAME
-	_ZN22TPhoneCmdParamRingTone7SetTypeE18TPhoneRingToneType @ 167 NONAME
-	_ZN22TPhoneCmdParamRingTone9SetVolumeEi @ 168 NONAME
-	_ZN22TPhoneCmdParamRingToneC1Ev @ 169 NONAME
-	_ZN22TPhoneCmdParamRingToneC2Ev @ 170 NONAME
-	_ZN23TPhoneCmdParamSpeedDial10NumberTypeEv @ 171 NONAME
-	_ZN23TPhoneCmdParamSpeedDial11PhoneNumberEv @ 172 NONAME
-	_ZN23TPhoneCmdParamSpeedDial11SetLocationEi @ 173 NONAME
-	_ZN23TPhoneCmdParamSpeedDial12SetServiceIdEj @ 174 NONAME
-	_ZN23TPhoneCmdParamSpeedDial13SetNumberTypeE16TPhoneNumberType @ 175 NONAME
-	_ZN23TPhoneCmdParamSpeedDial14SetPhoneNumberEP6TPtr16 @ 176 NONAME
-	_ZN23TPhoneCmdParamSpeedDial8LocationEv @ 177 NONAME
-	_ZN23TPhoneCmdParamSpeedDialC1Ev @ 178 NONAME
-	_ZN23TPhoneCmdParamSpeedDialC2Ev @ 179 NONAME
-	_ZN24TPhoneCmdParamGlobalNote11SetSoftkeysEi @ 180 NONAME
-	_ZN24TPhoneCmdParamGlobalNote15SetWaitForReadyEi @ 181 NONAME
-	_ZN24TPhoneCmdParamGlobalNote17SetTextResourceIdEi @ 182 NONAME
-	_ZN24TPhoneCmdParamGlobalNote7SetTextERK7TDesC16 @ 183 NONAME
-	_ZN24TPhoneCmdParamGlobalNote7SetToneEi @ 184 NONAME
-	_ZN24TPhoneCmdParamGlobalNote7SetTypeE18TAknGlobalNoteType @ 185 NONAME
-	_ZN24TPhoneCmdParamGlobalNoteC1Ev @ 186 NONAME
-	_ZN24TPhoneCmdParamGlobalNoteC2Ev @ 187 NONAME
-	_ZN24TPhoneCmdParamKeyCapture10SetKeyCodeE8TKeyCode @ 188 NONAME
-	_ZN24TPhoneCmdParamKeyCapture14SetCaptureTypeE17TPhoneCaptureType @ 189 NONAME
-	_ZN24TPhoneCmdParamKeyCapture6SetKeyE12TStdScanCode @ 190 NONAME
-	_ZN24TPhoneCmdParamKeyCaptureC1Ev @ 191 NONAME
-	_ZN24TPhoneCmdParamKeyCaptureC2Ev @ 192 NONAME
-	_ZN25TPhoneCmdParamAudioOutput14SetAudioOutputE14TPEAudioOutput @ 193 NONAME
-	_ZN25TPhoneCmdParamAudioOutputC1Ev @ 194 NONAME
-	_ZN25TPhoneCmdParamAudioOutputC2Ev @ 195 NONAME
-	_ZN25TPhoneCmdParamTransEffect7SetTypeE21TPhoneTransEffectType @ 196 NONAME
-	_ZN25TPhoneCmdParamTransEffectC1Ev @ 197 NONAME
-	_ZN25TPhoneCmdParamTransEffectC2Ev @ 198 NONAME
-	_ZN26CPhoneMainResourceResolver8InstanceEv @ 199 NONAME
-	_ZN26CPhoneResourceResolverBase14BaseConstructLEv @ 200 NONAME
-	_ZN26CPhoneResourceResolverBaseC1Ev @ 201 NONAME
-	_ZN26CPhoneResourceResolverBaseC2Ev @ 202 NONAME
-	_ZN26CPhoneResourceResolverBaseD0Ev @ 203 NONAME
-	_ZN26CPhoneResourceResolverBaseD1Ev @ 204 NONAME
-	_ZN26CPhoneResourceResolverBaseD2Ev @ 205 NONAME
-	_ZN26TPhoneCmdParamCustomDialer16DialerControllerEv @ 206 NONAME
-	_ZN26TPhoneCmdParamCustomDialer19SetDialerControllerEP22MPhoneDialerController @ 207 NONAME
-	_ZN26TPhoneCmdParamCustomDialerC1Ev @ 208 NONAME
-	_ZN26TPhoneCmdParamCustomDialerC2Ev @ 209 NONAME
-	_ZN26TPhoneCmdParamProgressNote11SetWaitTimeE27TTimeIntervalMicroSeconds32 @ 210 NONAME
-	_ZN26TPhoneCmdParamProgressNote13SetResourceIdEi @ 211 NONAME
-	_ZN26TPhoneCmdParamProgressNoteC1Ev @ 212 NONAME
-	_ZN26TPhoneCmdParamProgressNoteC2Ev @ 213 NONAME
-	_ZN27TPhoneCmdParamCallStateData12SetCallStateEi @ 214 NONAME
-	_ZN27TPhoneCmdParamCallStateData9SetCallIdEi @ 215 NONAME
-	_ZN27TPhoneCmdParamCallStateDataC1Ev @ 216 NONAME
-	_ZN27TPhoneCmdParamCallStateDataC2Ev @ 217 NONAME
-	_ZN27TPhoneCmdParamMessageEditor14SetMessageDataEP12CMessageData @ 218 NONAME
-	_ZN27TPhoneCmdParamMessageEditorC1Ev @ 219 NONAME
-	_ZN27TPhoneCmdParamMessageEditorC2Ev @ 220 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData10SetCLITextERK7TDesC16N14CBubbleManager23TPhoneClippingDirectionE @ 221 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData10SetPictureERK7TDesC16 @ 222 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData11AddCallFlagEN14CBubbleManager19TPhoneCallTypeFlagsE @ 223 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData11SetCNAPTextERK7TDesC16N14CBubbleManager23TPhoneClippingDirectionE @ 224 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData11SetCallFlagEN14CBubbleManager19TPhoneCallTypeFlagsE @ 225 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData11SetCallTypeEi @ 226 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData12SetCallStateEi @ 227 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData12SetCipheringEi @ 228 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData12SetLabelTextERK7TDesC16 @ 229 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData12SetServiceIdEm @ 230 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData12SetThumbnailEP10CFbsBitmap @ 231 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData13SetCallerTextERK7TDesC16 @ 232 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData13SetNumberTypeEi @ 233 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData14SetContactLinkERK6TDesC8 @ 234 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData15SetHasThumbnailEi @ 235 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData17SetShortLabelTextERK7TDesC16 @ 236 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData20SetRemotePhoneNumberERK7TDesC16 @ 237 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData21SetParticipantListCLIENS_24TPhoneParticipantListCLIE @ 238 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData28SetCipheringIndicatorAllowedEi @ 239 NONAME
-	_ZN28TPhoneCmdParamCallHeaderData8SetLine2Ei @ 240 NONAME
-	_ZN28TPhoneCmdParamCallHeaderDataC1Ev @ 241 NONAME
-	_ZN28TPhoneCmdParamCallHeaderDataC2Ev @ 242 NONAME
-	_ZN28TPhoneCmdParamReconnectQuery14SetPhoneNumberE7TPtrC16 @ 243 NONAME
-	_ZN28TPhoneCmdParamReconnectQuery17SetContactMatcherEP13CPhCntMatcher @ 244 NONAME
-	_ZN28TPhoneCmdParamReconnectQuery21SetIncludeVideoOptionEi @ 245 NONAME
-	_ZN28TPhoneCmdParamReconnectQueryC1ER27MCaUiReconnectQueryObserver @ 246 NONAME
-	_ZN28TPhoneCmdParamReconnectQueryC2ER27MCaUiReconnectQueryObserver @ 247 NONAME
-	_ZN29TPhoneCmdParamSingleItemFetch16SetCbaResourceIdEi @ 248 NONAME
-	_ZN29TPhoneCmdParamSingleItemFetch22SetTitlePaneResourceIdEi @ 249 NONAME
-	_ZN29TPhoneCmdParamSingleItemFetch4TypeEv @ 250 NONAME
-	_ZN29TPhoneCmdParamSingleItemFetch7SetTypeEN21CPhCntSingleItemFetch10TFetchTypeE @ 251 NONAME
-	_ZN29TPhoneCmdParamSingleItemFetch9SetStringEP6TDes16 @ 252 NONAME
-	_ZN29TPhoneCmdParamSingleItemFetchC1Ev @ 253 NONAME
-	_ZN29TPhoneCmdParamSingleItemFetchC2Ev @ 254 NONAME
-	_ZN30CPhoneMainErrorMessagesHandler8InstanceEv @ 255 NONAME
-	_ZN31TPhoneCmdParamAudioAvailability17SetBTAccAvailableEi @ 256 NONAME
-	_ZN31TPhoneCmdParamAudioAvailability20SetWiredAccAvailableEi @ 257 NONAME
-	_ZN31TPhoneCmdParamAudioAvailabilityC1Ev @ 258 NONAME
-	_ZN31TPhoneCmdParamAudioAvailabilityC2Ev @ 259 NONAME
-	_ZN33TPhoneCmdParamIncallIndicatorData12SetCallStateEi @ 260 NONAME
-	_ZN33TPhoneCmdParamIncallIndicatorData12SetCipheringEi @ 261 NONAME
-	_ZN33TPhoneCmdParamIncallIndicatorData12SetEmergencyEi @ 262 NONAME
-	_ZN33TPhoneCmdParamIncallIndicatorData22SetLittleBubbleVisibleEi @ 263 NONAME
-	_ZN33TPhoneCmdParamIncallIndicatorData28SetCipheringIndicatorAllowedEi @ 264 NONAME
-	_ZN33TPhoneCmdParamIncallIndicatorData7SetModeEi @ 265 NONAME
-	_ZN33TPhoneCmdParamIncallIndicatorData7SetMuteEi @ 266 NONAME
-	_ZN33TPhoneCmdParamIncallIndicatorData8SetLine2Ei @ 267 NONAME
-	_ZN33TPhoneCmdParamIncallIndicatorDataC1Ev @ 268 NONAME
-	_ZN33TPhoneCmdParamIncallIndicatorDataC2Ev @ 269 NONAME
-	_ZN33TPhoneCmdParamNumberEntryObserver11SetObserverE9TCallBack @ 270 NONAME
-	_ZN33TPhoneCmdParamNumberEntryObserver8ObserverEv @ 271 NONAME
-	_ZN33TPhoneCmdParamNumberEntryObserverC1Ev @ 272 NONAME
-	_ZN33TPhoneCmdParamNumberEntryObserverC2Ev @ 273 NONAME
-	_ZN37TPhoneCmdParamEmergencyCallHeaderData12SetCipheringEi @ 274 NONAME
-	_ZN37TPhoneCmdParamEmergencyCallHeaderData12SetLabelTextERK7TDesC16 @ 275 NONAME
-	_ZN37TPhoneCmdParamEmergencyCallHeaderData13SetHeaderTextERK7TDesC16 @ 276 NONAME
-	_ZN37TPhoneCmdParamEmergencyCallHeaderData21SetOwnPhoneNumberTextERK7TDesC16 @ 277 NONAME
-	_ZN37TPhoneCmdParamEmergencyCallHeaderData28SetCipheringIndicatorAllowedEi @ 278 NONAME
-	_ZN37TPhoneCmdParamEmergencyCallHeaderDataC1Ev @ 279 NONAME
-	_ZN37TPhoneCmdParamEmergencyCallHeaderDataC2Ev @ 280 NONAME
-	_ZNK13CPhoneStorage17GetBlockedKeyListEv @ 281 NONAME
-	_ZNK17CPhoneCenRepProxy4FindERK4TUidmmR6RArrayImE @ 282 NONAME
-	_ZNK17CPhoneCenRepProxy6GetIntERK4TUidjRi @ 283 NONAME
-	_ZNK17CPhoneCenRepProxy7GetRealERK4TUidjRd @ 284 NONAME
-	_ZNK17CPhoneCenRepProxy9GetStringERK4TUidjR6TDes16 @ 285 NONAME
-	_ZNK18TPhoneCmdParamNote10ResourceIdEv @ 286 NONAME
-	_ZNK18TPhoneCmdParamNote14TextResourceIdEv @ 287 NONAME
-	_ZNK18TPhoneCmdParamNote4TextEv @ 288 NONAME
-	_ZNK18TPhoneCmdParamNote4ToneEv @ 289 NONAME
-	_ZNK18TPhoneCmdParamNote4TypeEv @ 290 NONAME
-	_ZNK18TPhoneCmdParamNote7TimeoutEv @ 291 NONAME
-	_ZNK18TPhoneCommandParam7ParamIdEv @ 292 NONAME
-	_ZNK19CPhoneQwertyHandler13IsQwertyInputEv @ 293 NONAME
-	_ZNK19TPhoneCmdParamQuery10ContentCbaEv @ 294 NONAME
-	_ZNK19TPhoneCmdParamQuery10DefaultCbaEv @ 295 NONAME
-	_ZNK19TPhoneCmdParamQuery11QueryPromptEv @ 296 NONAME
-	_ZNK19TPhoneCmdParamQuery14SendKeyEnabledEv @ 297 NONAME
-	_ZNK19TPhoneCmdParamQuery15QueryResourceIdEv @ 298 NONAME
-	_ZNK19TPhoneCmdParamQuery17CbaCommandMappingEi @ 299 NONAME
-	_ZNK19TPhoneCmdParamQuery25ItemTextArrayForListQueryEv @ 300 NONAME
-	_ZNK19TPhoneCmdParamQuery26GetCustomCommandForTimeOutERi @ 301 NONAME
-	_ZNK19TPhoneCmdParamQuery4ToneEv @ 302 NONAME
-	_ZNK19TPhoneCmdParamQuery7TimeOutEv @ 303 NONAME
-	_ZNK19TPhoneCmdParamQuery8DataTextEv @ 304 NONAME
-	_ZNK19TPhoneCmdParamQuery9QueryTypeEv @ 305 NONAME
-	_ZNK20TPhoneCmdParamBitmap10MaskBitmapEv @ 306 NONAME
-	_ZNK20TPhoneCmdParamBitmap6BitmapEv @ 307 NONAME
-	_ZNK21TPhoneCmdParamAppInfo13CustomMessageEv @ 308 NONAME
-	_ZNK21TPhoneCmdParamAppInfo15CustomMessageIdEv @ 309 NONAME
-	_ZNK21TPhoneCmdParamAppInfo17MultipleInstancesEv @ 310 NONAME
-	_ZNK21TPhoneCmdParamAppInfo5ParamEv @ 311 NONAME
-	_ZNK21TPhoneCmdParamAppInfo6AppUidEv @ 312 NONAME
-	_ZNK21TPhoneCmdParamAppInfo7ViewUidEv @ 313 NONAME
-	_ZNK21TPhoneCmdParamBoolean7BooleanEv @ 314 NONAME
-	_ZNK21TPhoneCmdParamDynMenu10ResourceIdEv @ 315 NONAME
-	_ZNK21TPhoneCmdParamInteger7IntegerEv @ 316 NONAME
-	_ZNK21TPhoneCmdParamPointer7PointerEv @ 317 NONAME
-	_ZNK21TPhoneCmdParamSfiData4NameEv @ 318 NONAME
-	_ZNK21TPhoneCmdParamSfiData6NumberEv @ 319 NONAME
-	_ZNK22CPhoneCallThemeMonitor22CallImageThemeFilePathEv @ 320 NONAME
-	_ZNK22CPhoneCallThemeMonitor22CallImageThemeSettingsEv @ 321 NONAME
-	_ZNK22TPhoneCmdParamKeyEvent8KeyEventEv @ 322 NONAME
-	_ZNK22TPhoneCmdParamKeyEvent9EventCodeEv @ 323 NONAME
-	_ZNK22TPhoneCmdParamRingTone11RingingTypeEv @ 324 NONAME
-	_ZNK22TPhoneCmdParamRingTone4TypeEv @ 325 NONAME
-	_ZNK22TPhoneCmdParamRingTone6VolumeEv @ 326 NONAME
-	_ZNK22TPhoneCmdParamRingTone8RingToneEv @ 327 NONAME
-	_ZNK22TPhoneCmdParamRingTone9TextToSayEv @ 328 NONAME
-	_ZNK23TPhoneCmdParamSpeedDial9ServiceIdEv @ 329 NONAME
-	_ZNK24TPhoneCmdParamGlobalNote12WaitForReadyEv @ 330 NONAME
-	_ZNK24TPhoneCmdParamGlobalNote14TextResourceIdEv @ 331 NONAME
-	_ZNK24TPhoneCmdParamGlobalNote4TextEv @ 332 NONAME
-	_ZNK24TPhoneCmdParamGlobalNote4ToneEv @ 333 NONAME
-	_ZNK24TPhoneCmdParamGlobalNote4TypeEv @ 334 NONAME
-	_ZNK24TPhoneCmdParamGlobalNote8SoftkeysEv @ 335 NONAME
-	_ZNK24TPhoneCmdParamKeyCapture11CaptureTypeEv @ 336 NONAME
-	_ZNK24TPhoneCmdParamKeyCapture3KeyEv @ 337 NONAME
-	_ZNK24TPhoneCmdParamKeyCapture7KeyCodeEv @ 338 NONAME
-	_ZNK25TPhoneCmdParamAudioOutput11AudioOutputEv @ 339 NONAME
-	_ZNK25TPhoneCmdParamTransEffect4TypeEv @ 340 NONAME
-	_ZNK26CPhoneResourceResolverBase17ResolveResourceIDERKi @ 341 NONAME
-	_ZNK26CPhoneResourceResolverBase27IsTelephonyFeatureSupportedEi @ 342 NONAME
-	_ZNK26TPhoneCmdParamProgressNote10ResourceIdEv @ 343 NONAME
-	_ZNK26TPhoneCmdParamProgressNote8WaitTimeEv @ 344 NONAME
-	_ZNK27TPhoneCmdParamCallStateData6CallIdEv @ 345 NONAME
-	_ZNK27TPhoneCmdParamCallStateData9CallStateEv @ 346 NONAME
-	_ZNK27TPhoneCmdParamMessageEditor11MessageDataEv @ 347 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData10CallerTextEv @ 348 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData10NumberTypeEv @ 349 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData11ContactLinkEv @ 350 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData12HasThumbnailEv @ 351 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData14ParticipantCLIEv @ 352 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData14ShortLabelTextEv @ 353 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData17RemotePhoneNumberEv @ 354 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData24CLITextClippingDirectionEv @ 355 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData25CNAPTextClippingDirectionEv @ 356 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData25CipheringIndicatorAllowedEv @ 357 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData5Line2Ev @ 358 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData7CLITextEv @ 359 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData7PictureEv @ 360 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData8CNAPTextEv @ 361 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData8CallFlagEv @ 362 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData8CallTypeEv @ 363 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData9CallStateEv @ 364 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData9CipheringEv @ 365 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData9LabelTextEv @ 366 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData9ServiceIdEv @ 367 NONAME
-	_ZNK28TPhoneCmdParamCallHeaderData9ThumbnailEv @ 368 NONAME
-	_ZNK28TPhoneCmdParamReconnectQuery11PhoneNumberEv @ 369 NONAME
-	_ZNK28TPhoneCmdParamReconnectQuery14ContactMatcherEv @ 370 NONAME
-	_ZNK28TPhoneCmdParamReconnectQuery22IncludeVideoCallOptionEv @ 371 NONAME
-	_ZNK28TPhoneCmdParamReconnectQuery22ReconnectQueryObserverEv @ 372 NONAME
-	_ZNK29TPhoneCmdParamSingleItemFetch13CbaResourceIdEv @ 373 NONAME
-	_ZNK29TPhoneCmdParamSingleItemFetch19TitlePaneResourceIdEv @ 374 NONAME
-	_ZNK29TPhoneCmdParamSingleItemFetch6StringEv @ 375 NONAME
-	_ZNK31TPhoneCmdParamAudioAvailability16IsBTAccAvailableEv @ 376 NONAME
-	_ZNK31TPhoneCmdParamAudioAvailability19IsWiredAccAvailableEv @ 377 NONAME
-	_ZNK33TPhoneCmdParamIncallIndicatorData19LittleBubbleVisibleEv @ 378 NONAME
-	_ZNK33TPhoneCmdParamIncallIndicatorData25CipheringIndicatorAllowedEv @ 379 NONAME
-	_ZNK33TPhoneCmdParamIncallIndicatorData4ModeEv @ 380 NONAME
-	_ZNK33TPhoneCmdParamIncallIndicatorData4MuteEv @ 381 NONAME
-	_ZNK33TPhoneCmdParamIncallIndicatorData5Line2Ev @ 382 NONAME
-	_ZNK33TPhoneCmdParamIncallIndicatorData9CallStateEv @ 383 NONAME
-	_ZNK33TPhoneCmdParamIncallIndicatorData9CipheringEv @ 384 NONAME
-	_ZNK33TPhoneCmdParamIncallIndicatorData9EmergencyEv @ 385 NONAME
-	_ZNK37TPhoneCmdParamEmergencyCallHeaderData10HeaderTextEv @ 386 NONAME
-	_ZNK37TPhoneCmdParamEmergencyCallHeaderData18OwnPhoneNumberTextEv @ 387 NONAME
-	_ZNK37TPhoneCmdParamEmergencyCallHeaderData25CipheringIndicatorAllowedEv @ 388 NONAME
-	_ZNK37TPhoneCmdParamEmergencyCallHeaderData9CipheringEv @ 389 NONAME
-	_ZNK37TPhoneCmdParamEmergencyCallHeaderData9LabelTextEv @ 390 NONAME
-	_ZTI11CPhoneTimer @ 391 NONAME
-	_ZTI12CPhoneLogger @ 392 NONAME
-	_ZTI13CPhoneStorage @ 393 NONAME
-	_ZTI17CPhoneCenRepProxy @ 394 NONAME
-	_ZTI17CPhonePubSubProxy @ 395 NONAME
-	_ZTI18CPhoneMethodLogger @ 396 NONAME
-	_ZTI19CPhoneQwertyHandler @ 397 NONAME
-	_ZTI20CPhoneClearBlacklist @ 398 NONAME
-	_ZTI20CPhoneRecoverySystem @ 399 NONAME
-	_ZTI22CPhoneCallThemeMonitor @ 400 NONAME
-	_ZTI22CPhoneLibraryContainer @ 401 NONAME
-	_ZTI23CPhoneQwertyModeMonitor @ 402 NONAME
-	_ZTI24CPhoneCenRepEventHandler @ 403 NONAME
-	_ZTI24CPhoneLangSettingMonitor @ 404 NONAME
-	_ZTI25CPhonePublishSubscriberAO @ 405 NONAME
-	_ZTI26CPhoneMainResourceResolver @ 406 NONAME
-	_ZTI26CPhoneResourceResolverBase @ 407 NONAME
-	_ZTI30CPhoneMainErrorMessagesHandler @ 408 NONAME
-	_ZTV11CPhoneTimer @ 409 NONAME
-	_ZTV12CPhoneLogger @ 410 NONAME
-	_ZTV13CPhoneStorage @ 411 NONAME
-	_ZTV17CPhoneCenRepProxy @ 412 NONAME
-	_ZTV17CPhonePubSubProxy @ 413 NONAME
-	_ZTV18CPhoneMethodLogger @ 414 NONAME
-	_ZTV19CPhoneQwertyHandler @ 415 NONAME
-	_ZTV20CPhoneClearBlacklist @ 416 NONAME
-	_ZTV20CPhoneRecoverySystem @ 417 NONAME
-	_ZTV22CPhoneCallThemeMonitor @ 418 NONAME
-	_ZTV22CPhoneLibraryContainer @ 419 NONAME
-	_ZTV23CPhoneQwertyModeMonitor @ 420 NONAME
-	_ZTV24CPhoneCenRepEventHandler @ 421 NONAME
-	_ZTV24CPhoneLangSettingMonitor @ 422 NONAME
-	_ZTV25CPhonePublishSubscriberAO @ 423 NONAME
-	_ZTV26CPhoneMainResourceResolver @ 424 NONAME
-	_ZTV26CPhoneResourceResolverBase @ 425 NONAME
-	_ZTV30CPhoneMainErrorMessagesHandler @ 426 NONAME
-	_ZThn4_N12CPhoneLoggerD0Ev @ 427 NONAME
-	_ZThn4_N12CPhoneLoggerD1Ev @ 428 NONAME
-	_ZThn4_N13CPhoneStorage14IsScreenLockedEv @ 429 NONAME
-	_ZThn4_N13CPhoneStorage15SetScreenLockedEi @ 430 NONAME
-	_ZThn4_N13CPhoneStorage19NeedToEnableKeylockEv @ 431 NONAME
-	_ZThn4_N13CPhoneStorage20ResetBlockedKeysListEv @ 432 NONAME
-	_ZThn4_N13CPhoneStorage22AppendBlockedKeysListLE12TStdScanCode @ 433 NONAME
-	_ZThn4_N13CPhoneStorage22IsBlockedKeysListEmptyEv @ 434 NONAME
-	_ZThn4_N13CPhoneStorage22SetNeedToEnableKeylockEi @ 435 NONAME
-	_ZThn4_N13CPhoneStorageD0Ev @ 436 NONAME
-	_ZThn4_N13CPhoneStorageD1Ev @ 437 NONAME
-	_ZThn4_N26CPhoneResourceResolverBaseD0Ev @ 438 NONAME
-	_ZThn4_N26CPhoneResourceResolverBaseD1Ev @ 439 NONAME
-	_ZThn4_NK13CPhoneStorage17GetBlockedKeyListEv @ 440 NONAME
-	_ZThn4_NK26CPhoneResourceResolverBase17ResolveResourceIDERKi @ 441 NONAME
+	_ZN17CPhoneCenRepProxy12CancelNotifyEP20MPhoneCenRepObserverj @ 28 NONAME
+	_ZN17CPhoneCenRepProxy13NotifyChangeLERK4TUidjP20MPhoneCenRepObserver @ 29 NONAME
+	_ZN17CPhoneCenRepProxy17CancelAllNotifiesEP20MPhoneCenRepObserver @ 30 NONAME
+	_ZN17CPhoneCenRepProxy22FetchValuesFromCenRepLER21TPhoneCmdParamAppInfo8TKeyCodeP6HBufC8Ri @ 31 NONAME
+	_ZN17CPhoneCenRepProxy25IsPhoneUIFeatureSupportedEi @ 32 NONAME
+	_ZN17CPhoneCenRepProxy27IsTelephonyFeatureSupportedEi @ 33 NONAME
+	_ZN17CPhoneCenRepProxy6SetIntERK4TUidji @ 34 NONAME
+	_ZN17CPhoneCenRepProxy7SetRealERK4TUidjd @ 35 NONAME
+	_ZN17CPhoneCenRepProxy8InstanceEv @ 36 NONAME
+	_ZN17CPhoneCenRepProxy9SetStringERK4TUidjRK7TDesC16 @ 37 NONAME
+	_ZN17CPhoneCenRepProxyD0Ev @ 38 NONAME
+	_ZN17CPhoneCenRepProxyD1Ev @ 39 NONAME
+	_ZN17CPhoneCenRepProxyD2Ev @ 40 NONAME
+	_ZN17CPhonePubSubProxy13NotifyChangeLERK4TUidjP20MPhonePubSubObserver @ 41 NONAME
+	_ZN17CPhonePubSubProxy19ChangePropertyValueERK4TUidji @ 42 NONAME
+	_ZN17CPhonePubSubProxy22CancelAllNotificationsEP20MPhonePubSubObserver @ 43 NONAME
+	_ZN17CPhonePubSubProxy5ValueERK4TUidj @ 44 NONAME
+	_ZN17CPhonePubSubProxy8InstanceEv @ 45 NONAME
+	_ZN17CPhonePubSubProxyD0Ev @ 46 NONAME
+	_ZN17CPhonePubSubProxyD1Ev @ 47 NONAME
+	_ZN17CPhonePubSubProxyD2Ev @ 48 NONAME
+	_ZN18CPhoneMethodLoggerC1E24TPhoneUILoggingComponent7TPtrC16 @ 49 NONAME
+	_ZN18CPhoneMethodLoggerC2E24TPhoneUILoggingComponent7TPtrC16 @ 50 NONAME
+	_ZN18CPhoneMethodLoggerD0Ev @ 51 NONAME
+	_ZN18CPhoneMethodLoggerD1Ev @ 52 NONAME
+	_ZN18CPhoneMethodLoggerD2Ev @ 53 NONAME
+	_ZN18TPhoneCmdParamNote10SetTimeoutEN14CAknNoteDialog8TTimeoutE @ 54 NONAME
+	_ZN18TPhoneCmdParamNote13SetResourceIdEi @ 55 NONAME
+	_ZN18TPhoneCmdParamNote17SetTextResourceIdEi @ 56 NONAME
+	_ZN18TPhoneCmdParamNote7SetTextERK7TDesC16 @ 57 NONAME
+	_ZN18TPhoneCmdParamNote7SetToneEN14CAknNoteDialog5TToneE @ 58 NONAME
+	_ZN18TPhoneCmdParamNote7SetTypeE14TPhoneNoteType @ 59 NONAME
+	_ZN18TPhoneCmdParamNoteC1Ev @ 60 NONAME
+	_ZN18TPhoneCmdParamNoteC2Ev @ 61 NONAME
+	_ZN18TPhoneCommandParamC1Ev @ 62 NONAME
+	_ZN18TPhoneCommandParamC2Ev @ 63 NONAME
+	_ZN19CPhoneQwertyHandler14NumericKeyCodeERK9TKeyEvent @ 64 NONAME
+	_ZN19CPhoneQwertyHandler4NewLEv @ 65 NONAME
+	_ZN19CPhoneQwertyHandlerD0Ev @ 66 NONAME
+	_ZN19CPhoneQwertyHandlerD1Ev @ 67 NONAME
+	_ZN19CPhoneQwertyHandlerD2Ev @ 68 NONAME
+	_ZN19TPhoneCmdParamQuery10SetTimeOutEi @ 69 NONAME
+	_ZN19TPhoneCmdParamQuery11SetDataTextEP6TDes16 @ 70 NONAME
+	_ZN19TPhoneCmdParamQuery12SetQueryTypeE15TPhoneQueryType @ 71 NONAME
+	_ZN19TPhoneCmdParamQuery13SetContentCbaEi @ 72 NONAME
+	_ZN19TPhoneCmdParamQuery13SetDefaultCbaEi @ 73 NONAME
+	_ZN19TPhoneCmdParamQuery14SetQueryPromptERK7TDesC16 @ 74 NONAME
+	_ZN19TPhoneCmdParamQuery17SetCommandParamIdEN18TPhoneCommandParam13TPhoneParamIdE @ 75 NONAME
+	_ZN19TPhoneCmdParamQuery17SetSendKeyEnabledEi @ 76 NONAME
+	_ZN19TPhoneCmdParamQuery18SetQueryResourceIdEi @ 77 NONAME
+	_ZN19TPhoneCmdParamQuery20QueryCommandObserverEv @ 78 NONAME
+	_ZN19TPhoneCmdParamQuery20SetCbaCommandMappingEii @ 79 NONAME
+	_ZN19TPhoneCmdParamQuery23SetQueryCommandObserverER26MPhoneQueryCommandObserver @ 80 NONAME
+	_ZN19TPhoneCmdParamQuery26SetCustomCommandForTimeOutEi @ 81 NONAME
+	_ZN19TPhoneCmdParamQuery28SetItemTextArrayForListQueryER12MDesC16Array @ 82 NONAME
+	_ZN19TPhoneCmdParamQuery7SetToneEi @ 83 NONAME
+	_ZN19TPhoneCmdParamQueryC1ERKS_ @ 84 NONAME
+	_ZN19TPhoneCmdParamQueryC1Ev @ 85 NONAME
+	_ZN19TPhoneCmdParamQueryC2ERKS_ @ 86 NONAME
+	_ZN19TPhoneCmdParamQueryC2Ev @ 87 NONAME
+	_ZN19TPhoneCmdParamQueryaSERKS_ @ 88 NONAME
+	_ZN20CPhoneClearBlacklist17ClearBlackListNowEv @ 89 NONAME
+	_ZN20CPhoneClearBlacklist23ClearBlackListOnNextKeyEv @ 90 NONAME
+	_ZN20CPhoneClearBlacklist7CreateLER10RWsSessionRK11RWindowBase @ 91 NONAME
+	_ZN20CPhoneClearBlacklist8InstanceEv @ 92 NONAME
+	_ZN20CPhoneClearBlacklistD0Ev @ 93 NONAME
+	_ZN20CPhoneClearBlacklistD1Ev @ 94 NONAME
+	_ZN20CPhoneClearBlacklistD2Ev @ 95 NONAME
+	_ZN20CPhoneRecoverySystem10RecoverNowEiai @ 96 NONAME
+	_ZN20CPhoneRecoverySystem19EnablePreconditionLEv @ 97 NONAME
+	_ZN20CPhoneRecoverySystem4AddLE9TCallBackaN19CTeleRecoverySystem14TRecoveryStateE @ 98 NONAME
+	_ZN20CPhoneRecoverySystem6RemoveEi @ 99 NONAME
+	_ZN20CPhoneRecoverySystem8InstanceEv @ 100 NONAME
+	_ZN20TPhoneCmdParamBitmap13SetMaskBitmapEP10CFbsBitmap @ 101 NONAME
+	_ZN20TPhoneCmdParamBitmap9SetBitmapEP10CFbsBitmap @ 102 NONAME
+	_ZN20TPhoneCmdParamBitmapC1Ev @ 103 NONAME
+	_ZN20TPhoneCmdParamBitmapC2Ev @ 104 NONAME
+	_ZN20TPhoneCmdParamString6StringEv @ 105 NONAME
+	_ZN20TPhoneCmdParamString9SetStringEP6TPtr16 @ 106 NONAME
+	_ZN20TPhoneCmdParamStringC1Ev @ 107 NONAME
+	_ZN20TPhoneCmdParamStringC2Ev @ 108 NONAME
+	_ZN21TPhoneCmdParamAppInfo10SetViewUidERK4TUid @ 109 NONAME
+	_ZN21TPhoneCmdParamAppInfo16SetCustomMessageERK6TDesC8 @ 110 NONAME
+	_ZN21TPhoneCmdParamAppInfo18SetCustomMessageIdERK4TUid @ 111 NONAME
+	_ZN21TPhoneCmdParamAppInfo20SetMultipleInstancesEi @ 112 NONAME
+	_ZN21TPhoneCmdParamAppInfo8SetParamERK6TDesC8 @ 113 NONAME
+	_ZN21TPhoneCmdParamAppInfo9SetAppUidERK4TUid @ 114 NONAME
+	_ZN21TPhoneCmdParamAppInfoC1Ev @ 115 NONAME
+	_ZN21TPhoneCmdParamAppInfoC2Ev @ 116 NONAME
+	_ZN21TPhoneCmdParamBoolean10SetBooleanEi @ 117 NONAME
+	_ZN21TPhoneCmdParamBooleanC1Ev @ 118 NONAME
+	_ZN21TPhoneCmdParamBooleanC2Ev @ 119 NONAME
+	_ZN21TPhoneCmdParamDynMenu10SetDynMenuEPv @ 120 NONAME
+	_ZN21TPhoneCmdParamDynMenu13SetResourceIdEi @ 121 NONAME
+	_ZN21TPhoneCmdParamDynMenu7DynMenuEv @ 122 NONAME
+	_ZN21TPhoneCmdParamDynMenuC1Ev @ 123 NONAME
+	_ZN21TPhoneCmdParamDynMenuC2Ev @ 124 NONAME
+	_ZN21TPhoneCmdParamInteger10SetIntegerEi @ 125 NONAME
+	_ZN21TPhoneCmdParamIntegerC1Ev @ 126 NONAME
+	_ZN21TPhoneCmdParamIntegerC2Ev @ 127 NONAME
+	_ZN21TPhoneCmdParamPointer10SetPointerEPv @ 128 NONAME
+	_ZN21TPhoneCmdParamPointerC1Ev @ 129 NONAME
+	_ZN21TPhoneCmdParamPointerC2Ev @ 130 NONAME
+	_ZN21TPhoneCmdParamSfiData7SetNameERK7TDesC16 @ 131 NONAME
+	_ZN21TPhoneCmdParamSfiData9SetNumberERK7TDesC16 @ 132 NONAME
+	_ZN21TPhoneCmdParamSfiDataC1Ev @ 133 NONAME
+	_ZN21TPhoneCmdParamSfiDataC2Ev @ 134 NONAME
+	_ZN22CPhoneCallThemeMonitor28SetCallThemeSettingsObserverEP31MPhoneCallThemeSettingsObserver @ 135 NONAME
+	_ZN22CPhoneCallThemeMonitor4NewLEv @ 136 NONAME
+	_ZN22CPhoneCallThemeMonitorD0Ev @ 137 NONAME
+	_ZN22CPhoneCallThemeMonitorD1Ev @ 138 NONAME
+	_ZN22CPhoneCallThemeMonitorD2Ev @ 139 NONAME
+	_ZN22CPhoneLibraryContainer11AddLibraryLERK8RLibrary @ 140 NONAME
+	_ZN22CPhoneLibraryContainer4NewLEv @ 141 NONAME
+	_ZN22CPhoneLibraryContainerD0Ev @ 142 NONAME
+	_ZN22CPhoneLibraryContainerD1Ev @ 143 NONAME
+	_ZN22CPhoneLibraryContainerD2Ev @ 144 NONAME
+	_ZN22TPhoneCmdParamKeyEvent11SetKeyEventERK9TKeyEvent @ 145 NONAME
+	_ZN22TPhoneCmdParamKeyEvent12SetEventCodeE10TEventCode @ 146 NONAME
+	_ZN22TPhoneCmdParamKeyEventC1Ev @ 147 NONAME
+	_ZN22TPhoneCmdParamKeyEventC2Ev @ 148 NONAME
+	_ZN22TPhoneCmdParamRingTone11SetRingToneERK7TDesC16 @ 149 NONAME
+	_ZN22TPhoneCmdParamRingTone12IsCallerTextEv @ 150 NONAME
+	_ZN22TPhoneCmdParamRingTone12SetTextToSayERK7TDesC16 @ 151 NONAME
+	_ZN22TPhoneCmdParamRingTone13IsCallerImageEv @ 152 NONAME
+	_ZN22TPhoneCmdParamRingTone14SetRingingTypeEi @ 153 NONAME
+	_ZN22TPhoneCmdParamRingTone19SetCallerTextStatusEi @ 154 NONAME
+	_ZN22TPhoneCmdParamRingTone20SetCallerImageStatusEi @ 155 NONAME
+	_ZN22TPhoneCmdParamRingTone7SetTypeE18TPhoneRingToneType @ 156 NONAME
+	_ZN22TPhoneCmdParamRingTone9SetVolumeEi @ 157 NONAME
+	_ZN22TPhoneCmdParamRingToneC1Ev @ 158 NONAME
+	_ZN22TPhoneCmdParamRingToneC2Ev @ 159 NONAME
+	_ZN23TPhoneCmdParamSpeedDial10NumberTypeEv @ 160 NONAME
+	_ZN23TPhoneCmdParamSpeedDial11PhoneNumberEv @ 161 NONAME
+	_ZN23TPhoneCmdParamSpeedDial11SetLocationEi @ 162 NONAME
+	_ZN23TPhoneCmdParamSpeedDial12SetServiceIdEj @ 163 NONAME
+	_ZN23TPhoneCmdParamSpeedDial13SetNumberTypeE16TPhoneNumberType @ 164 NONAME
+	_ZN23TPhoneCmdParamSpeedDial14SetPhoneNumberEP6TPtr16 @ 165 NONAME
+	_ZN23TPhoneCmdParamSpeedDial8LocationEv @ 166 NONAME
+	_ZN23TPhoneCmdParamSpeedDialC1Ev @ 167 NONAME
+	_ZN23TPhoneCmdParamSpeedDialC2Ev @ 168 NONAME
+	_ZN24TPhoneCmdParamGlobalNote11SetSoftkeysEi @ 169 NONAME
+	_ZN24TPhoneCmdParamGlobalNote15SetWaitForReadyEi @ 170 NONAME
+	_ZN24TPhoneCmdParamGlobalNote17SetTextResourceIdEi @ 171 NONAME
+	_ZN24TPhoneCmdParamGlobalNote7SetTextERK7TDesC16 @ 172 NONAME
+	_ZN24TPhoneCmdParamGlobalNote7SetToneEi @ 173 NONAME
+	_ZN24TPhoneCmdParamGlobalNote7SetTypeE18TAknGlobalNoteType @ 174 NONAME
+	_ZN24TPhoneCmdParamGlobalNoteC1Ev @ 175 NONAME
+	_ZN24TPhoneCmdParamGlobalNoteC2Ev @ 176 NONAME
+	_ZN24TPhoneCmdParamKeyCapture10SetKeyCodeE8TKeyCode @ 177 NONAME
+	_ZN24TPhoneCmdParamKeyCapture14SetCaptureTypeE17TPhoneCaptureType @ 178 NONAME
+	_ZN24TPhoneCmdParamKeyCapture6SetKeyE12TStdScanCode @ 179 NONAME
+	_ZN24TPhoneCmdParamKeyCaptureC1Ev @ 180 NONAME
+	_ZN24TPhoneCmdParamKeyCaptureC2Ev @ 181 NONAME
+	_ZN25TPhoneCmdParamAudioOutput14SetAudioOutputE14TPEAudioOutput @ 182 NONAME
+	_ZN25TPhoneCmdParamAudioOutputC1Ev @ 183 NONAME
+	_ZN25TPhoneCmdParamAudioOutputC2Ev @ 184 NONAME
+	_ZN25TPhoneCmdParamTransEffect7SetTypeE21TPhoneTransEffectType @ 185 NONAME
+	_ZN25TPhoneCmdParamTransEffectC1Ev @ 186 NONAME
+	_ZN25TPhoneCmdParamTransEffectC2Ev @ 187 NONAME
+	_ZN26CPhoneMainResourceResolver8InstanceEv @ 188 NONAME
+	_ZN26CPhoneResourceResolverBase14BaseConstructLEv @ 189 NONAME
+	_ZN26CPhoneResourceResolverBaseC1Ev @ 190 NONAME
+	_ZN26CPhoneResourceResolverBaseC2Ev @ 191 NONAME
+	_ZN26CPhoneResourceResolverBaseD0Ev @ 192 NONAME
+	_ZN26CPhoneResourceResolverBaseD1Ev @ 193 NONAME
+	_ZN26CPhoneResourceResolverBaseD2Ev @ 194 NONAME
+	_ZN26TPhoneCmdParamCustomDialer16DialerControllerEv @ 195 NONAME
+	_ZN26TPhoneCmdParamCustomDialer19SetDialerControllerEP22MPhoneDialerController @ 196 NONAME
+	_ZN26TPhoneCmdParamCustomDialerC1Ev @ 197 NONAME
+	_ZN26TPhoneCmdParamCustomDialerC2Ev @ 198 NONAME
+	_ZN26TPhoneCmdParamProgressNote11SetWaitTimeE27TTimeIntervalMicroSeconds32 @ 199 NONAME
+	_ZN26TPhoneCmdParamProgressNote13SetResourceIdEi @ 200 NONAME
+	_ZN26TPhoneCmdParamProgressNoteC1Ev @ 201 NONAME
+	_ZN26TPhoneCmdParamProgressNoteC2Ev @ 202 NONAME
+	_ZN27TPhoneCmdParamCallStateData12SetCallStateEi @ 203 NONAME
+	_ZN27TPhoneCmdParamCallStateData9SetCallIdEi @ 204 NONAME
+	_ZN27TPhoneCmdParamCallStateDataC1Ev @ 205 NONAME
+	_ZN27TPhoneCmdParamCallStateDataC2Ev @ 206 NONAME
+	_ZN27TPhoneCmdParamMessageEditor14SetMessageDataEP12CMessageData @ 207 NONAME
+	_ZN27TPhoneCmdParamMessageEditorC1Ev @ 208 NONAME
+	_ZN27TPhoneCmdParamMessageEditorC2Ev @ 209 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData10SetCLITextERK7TDesC16N14CBubbleManager23TPhoneClippingDirectionE @ 210 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData10SetPictureERK7TDesC16 @ 211 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData11AddCallFlagEN14CBubbleManager19TPhoneCallTypeFlagsE @ 212 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData11SetCNAPTextERK7TDesC16N14CBubbleManager23TPhoneClippingDirectionE @ 213 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData11SetCallFlagEN14CBubbleManager19TPhoneCallTypeFlagsE @ 214 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData11SetCallTypeEi @ 215 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData12SetCallStateEi @ 216 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData12SetCipheringEi @ 217 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData12SetLabelTextERK7TDesC16 @ 218 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData12SetServiceIdEm @ 219 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData12SetThumbnailEP10CFbsBitmap @ 220 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData13SetCallerTextERK7TDesC16 @ 221 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData13SetNumberTypeEi @ 222 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData14SetContactLinkERK6TDesC8 @ 223 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData15SetHasThumbnailEi @ 224 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData17SetShortLabelTextERK7TDesC16 @ 225 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData20SetRemotePhoneNumberERK7TDesC16 @ 226 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData21SetParticipantListCLIENS_24TPhoneParticipantListCLIE @ 227 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData28SetCipheringIndicatorAllowedEi @ 228 NONAME
+	_ZN28TPhoneCmdParamCallHeaderData8SetLine2Ei @ 229 NONAME
+	_ZN28TPhoneCmdParamCallHeaderDataC1Ev @ 230 NONAME
+	_ZN28TPhoneCmdParamCallHeaderDataC2Ev @ 231 NONAME
+	_ZN28TPhoneCmdParamReconnectQuery14SetPhoneNumberE7TPtrC16 @ 232 NONAME
+	_ZN28TPhoneCmdParamReconnectQuery17SetContactMatcherEP13CPhCntMatcher @ 233 NONAME
+	_ZN28TPhoneCmdParamReconnectQuery21SetIncludeVideoOptionEi @ 234 NONAME
+	_ZN28TPhoneCmdParamReconnectQueryC1ER27MCaUiReconnectQueryObserver @ 235 NONAME
+	_ZN28TPhoneCmdParamReconnectQueryC2ER27MCaUiReconnectQueryObserver @ 236 NONAME
+	_ZN29TPhoneCmdParamSingleItemFetch16SetCbaResourceIdEi @ 237 NONAME
+	_ZN29TPhoneCmdParamSingleItemFetch22SetTitlePaneResourceIdEi @ 238 NONAME
+	_ZN29TPhoneCmdParamSingleItemFetch4TypeEv @ 239 NONAME
+	_ZN29TPhoneCmdParamSingleItemFetch7SetTypeEN21CPhCntSingleItemFetch10TFetchTypeE @ 240 NONAME
+	_ZN29TPhoneCmdParamSingleItemFetch9SetStringEP6TDes16 @ 241 NONAME
+	_ZN29TPhoneCmdParamSingleItemFetchC1Ev @ 242 NONAME
+	_ZN29TPhoneCmdParamSingleItemFetchC2Ev @ 243 NONAME
+	_ZN30CPhoneMainErrorMessagesHandler8InstanceEv @ 244 NONAME
+	_ZN31TPhoneCmdParamAudioAvailability17SetBTAccAvailableEi @ 245 NONAME
+	_ZN31TPhoneCmdParamAudioAvailability20SetWiredAccAvailableEi @ 246 NONAME
+	_ZN31TPhoneCmdParamAudioAvailabilityC1Ev @ 247 NONAME
+	_ZN31TPhoneCmdParamAudioAvailabilityC2Ev @ 248 NONAME
+	_ZN33TPhoneCmdParamIncallIndicatorData12SetCallStateEi @ 249 NONAME
+	_ZN33TPhoneCmdParamIncallIndicatorData12SetCipheringEi @ 250 NONAME
+	_ZN33TPhoneCmdParamIncallIndicatorData12SetEmergencyEi @ 251 NONAME
+	_ZN33TPhoneCmdParamIncallIndicatorData22SetLittleBubbleVisibleEi @ 252 NONAME
+	_ZN33TPhoneCmdParamIncallIndicatorData28SetCipheringIndicatorAllowedEi @ 253 NONAME
+	_ZN33TPhoneCmdParamIncallIndicatorData7SetModeEi @ 254 NONAME
+	_ZN33TPhoneCmdParamIncallIndicatorData7SetMuteEi @ 255 NONAME
+	_ZN33TPhoneCmdParamIncallIndicatorData8SetLine2Ei @ 256 NONAME
+	_ZN33TPhoneCmdParamIncallIndicatorDataC1Ev @ 257 NONAME
+	_ZN33TPhoneCmdParamIncallIndicatorDataC2Ev @ 258 NONAME
+	_ZN33TPhoneCmdParamNumberEntryObserver11SetObserverE9TCallBack @ 259 NONAME
+	_ZN33TPhoneCmdParamNumberEntryObserver8ObserverEv @ 260 NONAME
+	_ZN33TPhoneCmdParamNumberEntryObserverC1Ev @ 261 NONAME
+	_ZN33TPhoneCmdParamNumberEntryObserverC2Ev @ 262 NONAME
+	_ZN37TPhoneCmdParamEmergencyCallHeaderData12SetCipheringEi @ 263 NONAME
+	_ZN37TPhoneCmdParamEmergencyCallHeaderData12SetLabelTextERK7TDesC16 @ 264 NONAME
+	_ZN37TPhoneCmdParamEmergencyCallHeaderData13SetHeaderTextERK7TDesC16 @ 265 NONAME
+	_ZN37TPhoneCmdParamEmergencyCallHeaderData21SetOwnPhoneNumberTextERK7TDesC16 @ 266 NONAME
+	_ZN37TPhoneCmdParamEmergencyCallHeaderData28SetCipheringIndicatorAllowedEi @ 267 NONAME
+	_ZN37TPhoneCmdParamEmergencyCallHeaderDataC1Ev @ 268 NONAME
+	_ZN37TPhoneCmdParamEmergencyCallHeaderDataC2Ev @ 269 NONAME
+	_ZNK17CPhoneCenRepProxy4FindERK4TUidmmR6RArrayImE @ 270 NONAME
+	_ZNK17CPhoneCenRepProxy6GetIntERK4TUidjRi @ 271 NONAME
+	_ZNK17CPhoneCenRepProxy7GetRealERK4TUidjRd @ 272 NONAME
+	_ZNK17CPhoneCenRepProxy9GetStringERK4TUidjR6TDes16 @ 273 NONAME
+	_ZNK18TPhoneCmdParamNote10ResourceIdEv @ 274 NONAME
+	_ZNK18TPhoneCmdParamNote14TextResourceIdEv @ 275 NONAME
+	_ZNK18TPhoneCmdParamNote4TextEv @ 276 NONAME
+	_ZNK18TPhoneCmdParamNote4ToneEv @ 277 NONAME
+	_ZNK18TPhoneCmdParamNote4TypeEv @ 278 NONAME
+	_ZNK18TPhoneCmdParamNote7TimeoutEv @ 279 NONAME
+	_ZNK18TPhoneCommandParam7ParamIdEv @ 280 NONAME
+	_ZNK19CPhoneQwertyHandler13IsQwertyInputEv @ 281 NONAME
+	_ZNK19TPhoneCmdParamQuery10ContentCbaEv @ 282 NONAME
+	_ZNK19TPhoneCmdParamQuery10DefaultCbaEv @ 283 NONAME
+	_ZNK19TPhoneCmdParamQuery11QueryPromptEv @ 284 NONAME
+	_ZNK19TPhoneCmdParamQuery14SendKeyEnabledEv @ 285 NONAME
+	_ZNK19TPhoneCmdParamQuery15QueryResourceIdEv @ 286 NONAME
+	_ZNK19TPhoneCmdParamQuery17CbaCommandMappingEi @ 287 NONAME
+	_ZNK19TPhoneCmdParamQuery25ItemTextArrayForListQueryEv @ 288 NONAME
+	_ZNK19TPhoneCmdParamQuery26GetCustomCommandForTimeOutERi @ 289 NONAME
+	_ZNK19TPhoneCmdParamQuery4ToneEv @ 290 NONAME
+	_ZNK19TPhoneCmdParamQuery7TimeOutEv @ 291 NONAME
+	_ZNK19TPhoneCmdParamQuery8DataTextEv @ 292 NONAME
+	_ZNK19TPhoneCmdParamQuery9QueryTypeEv @ 293 NONAME
+	_ZNK20TPhoneCmdParamBitmap10MaskBitmapEv @ 294 NONAME
+	_ZNK20TPhoneCmdParamBitmap6BitmapEv @ 295 NONAME
+	_ZNK21TPhoneCmdParamAppInfo13CustomMessageEv @ 296 NONAME
+	_ZNK21TPhoneCmdParamAppInfo15CustomMessageIdEv @ 297 NONAME
+	_ZNK21TPhoneCmdParamAppInfo17MultipleInstancesEv @ 298 NONAME
+	_ZNK21TPhoneCmdParamAppInfo5ParamEv @ 299 NONAME
+	_ZNK21TPhoneCmdParamAppInfo6AppUidEv @ 300 NONAME
+	_ZNK21TPhoneCmdParamAppInfo7ViewUidEv @ 301 NONAME
+	_ZNK21TPhoneCmdParamBoolean7BooleanEv @ 302 NONAME
+	_ZNK21TPhoneCmdParamDynMenu10ResourceIdEv @ 303 NONAME
+	_ZNK21TPhoneCmdParamInteger7IntegerEv @ 304 NONAME
+	_ZNK21TPhoneCmdParamPointer7PointerEv @ 305 NONAME
+	_ZNK21TPhoneCmdParamSfiData4NameEv @ 306 NONAME
+	_ZNK21TPhoneCmdParamSfiData6NumberEv @ 307 NONAME
+	_ZNK22CPhoneCallThemeMonitor22CallImageThemeFilePathEv @ 308 NONAME
+	_ZNK22CPhoneCallThemeMonitor22CallImageThemeSettingsEv @ 309 NONAME
+	_ZNK22TPhoneCmdParamKeyEvent8KeyEventEv @ 310 NONAME
+	_ZNK22TPhoneCmdParamKeyEvent9EventCodeEv @ 311 NONAME
+	_ZNK22TPhoneCmdParamRingTone11RingingTypeEv @ 312 NONAME
+	_ZNK22TPhoneCmdParamRingTone4TypeEv @ 313 NONAME
+	_ZNK22TPhoneCmdParamRingTone6VolumeEv @ 314 NONAME
+	_ZNK22TPhoneCmdParamRingTone8RingToneEv @ 315 NONAME
+	_ZNK22TPhoneCmdParamRingTone9TextToSayEv @ 316 NONAME
+	_ZNK23TPhoneCmdParamSpeedDial9ServiceIdEv @ 317 NONAME
+	_ZNK24TPhoneCmdParamGlobalNote12WaitForReadyEv @ 318 NONAME
+	_ZNK24TPhoneCmdParamGlobalNote14TextResourceIdEv @ 319 NONAME
+	_ZNK24TPhoneCmdParamGlobalNote4TextEv @ 320 NONAME
+	_ZNK24TPhoneCmdParamGlobalNote4ToneEv @ 321 NONAME
+	_ZNK24TPhoneCmdParamGlobalNote4TypeEv @ 322 NONAME
+	_ZNK24TPhoneCmdParamGlobalNote8SoftkeysEv @ 323 NONAME
+	_ZNK24TPhoneCmdParamKeyCapture11CaptureTypeEv @ 324 NONAME
+	_ZNK24TPhoneCmdParamKeyCapture3KeyEv @ 325 NONAME
+	_ZNK24TPhoneCmdParamKeyCapture7KeyCodeEv @ 326 NONAME
+	_ZNK25TPhoneCmdParamAudioOutput11AudioOutputEv @ 327 NONAME
+	_ZNK25TPhoneCmdParamTransEffect4TypeEv @ 328 NONAME
+	_ZNK26CPhoneResourceResolverBase17ResolveResourceIDERKi @ 329 NONAME
+	_ZNK26CPhoneResourceResolverBase27IsTelephonyFeatureSupportedEi @ 330 NONAME
+	_ZNK26TPhoneCmdParamProgressNote10ResourceIdEv @ 331 NONAME
+	_ZNK26TPhoneCmdParamProgressNote8WaitTimeEv @ 332 NONAME
+	_ZNK27TPhoneCmdParamCallStateData6CallIdEv @ 333 NONAME
+	_ZNK27TPhoneCmdParamCallStateData9CallStateEv @ 334 NONAME
+	_ZNK27TPhoneCmdParamMessageEditor11MessageDataEv @ 335 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData10CallerTextEv @ 336 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData10NumberTypeEv @ 337 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData11ContactLinkEv @ 338 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData12HasThumbnailEv @ 339 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData14ParticipantCLIEv @ 340 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData14ShortLabelTextEv @ 341 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData17RemotePhoneNumberEv @ 342 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData24CLITextClippingDirectionEv @ 343 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData25CNAPTextClippingDirectionEv @ 344 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData25CipheringIndicatorAllowedEv @ 345 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData5Line2Ev @ 346 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData7CLITextEv @ 347 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData7PictureEv @ 348 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData8CNAPTextEv @ 349 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData8CallFlagEv @ 350 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData8CallTypeEv @ 351 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData9CallStateEv @ 352 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData9CipheringEv @ 353 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData9LabelTextEv @ 354 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData9ServiceIdEv @ 355 NONAME
+	_ZNK28TPhoneCmdParamCallHeaderData9ThumbnailEv @ 356 NONAME
+	_ZNK28TPhoneCmdParamReconnectQuery11PhoneNumberEv @ 357 NONAME
+	_ZNK28TPhoneCmdParamReconnectQuery14ContactMatcherEv @ 358 NONAME
+	_ZNK28TPhoneCmdParamReconnectQuery22IncludeVideoCallOptionEv @ 359 NONAME
+	_ZNK28TPhoneCmdParamReconnectQuery22ReconnectQueryObserverEv @ 360 NONAME
+	_ZNK29TPhoneCmdParamSingleItemFetch13CbaResourceIdEv @ 361 NONAME
+	_ZNK29TPhoneCmdParamSingleItemFetch19TitlePaneResourceIdEv @ 362 NONAME
+	_ZNK29TPhoneCmdParamSingleItemFetch6StringEv @ 363 NONAME
+	_ZNK31TPhoneCmdParamAudioAvailability16IsBTAccAvailableEv @ 364 NONAME
+	_ZNK31TPhoneCmdParamAudioAvailability19IsWiredAccAvailableEv @ 365 NONAME
+	_ZNK33TPhoneCmdParamIncallIndicatorData19LittleBubbleVisibleEv @ 366 NONAME
+	_ZNK33TPhoneCmdParamIncallIndicatorData25CipheringIndicatorAllowedEv @ 367 NONAME
+	_ZNK33TPhoneCmdParamIncallIndicatorData4ModeEv @ 368 NONAME
+	_ZNK33TPhoneCmdParamIncallIndicatorData4MuteEv @ 369 NONAME
+	_ZNK33TPhoneCmdParamIncallIndicatorData5Line2Ev @ 370 NONAME
+	_ZNK33TPhoneCmdParamIncallIndicatorData9CallStateEv @ 371 NONAME
+	_ZNK33TPhoneCmdParamIncallIndicatorData9CipheringEv @ 372 NONAME
+	_ZNK33TPhoneCmdParamIncallIndicatorData9EmergencyEv @ 373 NONAME
+	_ZNK37TPhoneCmdParamEmergencyCallHeaderData10HeaderTextEv @ 374 NONAME
+	_ZNK37TPhoneCmdParamEmergencyCallHeaderData18OwnPhoneNumberTextEv @ 375 NONAME
+	_ZNK37TPhoneCmdParamEmergencyCallHeaderData25CipheringIndicatorAllowedEv @ 376 NONAME
+	_ZNK37TPhoneCmdParamEmergencyCallHeaderData9CipheringEv @ 377 NONAME
+	_ZNK37TPhoneCmdParamEmergencyCallHeaderData9LabelTextEv @ 378 NONAME
+	_ZTI11CPhoneTimer @ 379 NONAME
+	_ZTI12CPhoneLogger @ 380 NONAME
+	_ZTI17CPhoneCenRepProxy @ 381 NONAME
+	_ZTI17CPhonePubSubProxy @ 382 NONAME
+	_ZTI18CPhoneMethodLogger @ 383 NONAME
+	_ZTI19CPhoneQwertyHandler @ 384 NONAME
+	_ZTI20CPhoneClearBlacklist @ 385 NONAME
+	_ZTI20CPhoneRecoverySystem @ 386 NONAME
+	_ZTI22CPhoneCallThemeMonitor @ 387 NONAME
+	_ZTI22CPhoneLibraryContainer @ 388 NONAME
+	_ZTI23CPhoneQwertyModeMonitor @ 389 NONAME
+	_ZTI24CPhoneCenRepEventHandler @ 390 NONAME
+	_ZTI24CPhoneLangSettingMonitor @ 391 NONAME
+	_ZTI25CPhonePublishSubscriberAO @ 392 NONAME
+	_ZTI26CPhoneMainResourceResolver @ 393 NONAME
+	_ZTI26CPhoneResourceResolverBase @ 394 NONAME
+	_ZTI30CPhoneMainErrorMessagesHandler @ 395 NONAME
+	_ZTV11CPhoneTimer @ 396 NONAME
+	_ZTV12CPhoneLogger @ 397 NONAME
+	_ZTV17CPhoneCenRepProxy @ 398 NONAME
+	_ZTV17CPhonePubSubProxy @ 399 NONAME
+	_ZTV18CPhoneMethodLogger @ 400 NONAME
+	_ZTV19CPhoneQwertyHandler @ 401 NONAME
+	_ZTV20CPhoneClearBlacklist @ 402 NONAME
+	_ZTV20CPhoneRecoverySystem @ 403 NONAME
+	_ZTV22CPhoneCallThemeMonitor @ 404 NONAME
+	_ZTV22CPhoneLibraryContainer @ 405 NONAME
+	_ZTV23CPhoneQwertyModeMonitor @ 406 NONAME
+	_ZTV24CPhoneCenRepEventHandler @ 407 NONAME
+	_ZTV24CPhoneLangSettingMonitor @ 408 NONAME
+	_ZTV25CPhonePublishSubscriberAO @ 409 NONAME
+	_ZTV26CPhoneMainResourceResolver @ 410 NONAME
+	_ZTV26CPhoneResourceResolverBase @ 411 NONAME
+	_ZTV30CPhoneMainErrorMessagesHandler @ 412 NONAME
+	_ZThn4_N12CPhoneLoggerD0Ev @ 413 NONAME
+	_ZThn4_N12CPhoneLoggerD1Ev @ 414 NONAME
+	_ZThn4_N26CPhoneResourceResolverBaseD0Ev @ 415 NONAME
+	_ZThn4_N26CPhoneResourceResolverBaseD1Ev @ 416 NONAME
+	_ZThn4_NK26CPhoneResourceResolverBase17ResolveResourceIDERKi @ 417 NONAME
 
--- a/phoneapp/phoneuiutils/group/phoneuiutils.mmp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiutils/group/phoneuiutils.mmp	Mon Mar 15 12:40:24 2010 +0200
@@ -53,7 +53,6 @@
 SOURCE          phoneloggerviewcommands.cpp
 SOURCE          phonestatestrings.cpp
 SOURCE          phonestatestringsgsm.cpp
-SOURCE          cphonestorage.cpp
 SOURCE          rphoneanimclearblacklist.cpp
 SOURCE          tphonecmdparamappinfo.cpp
 SOURCE          tphonecmdparamaudiooutput.cpp
--- a/phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h	Mon Mar 15 12:40:24 2010 +0200
@@ -257,8 +257,6 @@
 		EPhoneViewSetStatusPaneVisible,
 		/** EPhoneViewEnableKeyLock */
 		EPhoneViewEnableKeyLock,
-		/** EPhoneViewEnableKeyLockWithoutNote */
-		EPhoneViewEnableKeyLockWithoutNote,
 		/** EPhoneViewLaunchFaxModem */
 		EPhoneViewLaunchFaxModem,
 		/** EPhoneViewUpdateFSW */
@@ -369,10 +367,6 @@
 		EPhoneViewCancelAllNotications,
 		/** EPhoneViewSetVideoCallDTMFVisibilityFlag */
 		EPhoneViewSetVideoCallDTMFVisibilityFlag,
-		/** EPhoneViewIsKeyLockEnabled */
-		EPhoneViewIsKeyLockEnabled,
-		/** EPhoneViewDisableKeyLock */
-		EPhoneViewDisableKeyLock,
 		/** EPhoneViewLoadPlugins */
 		EPhoneViewLoadPlugins,
 		/** PhoneViewServiceSelection */
--- a/phoneapp/phoneuiutils/inc/phonerssbase.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiutils/inc/phonerssbase.h	Mon Mar 15 12:40:24 2010 +0200
@@ -37,7 +37,6 @@
     EPhoneExitEmergencyModeQuery,
     EPhoneIncomingCallLabel,
     EPhoneIncomingCallLabelShort,
-    EPhoneIncomingCallKeysLocked,
     EPhoneOutgoingVideoCallLabel,
     EPhoneOutgoingVideoCallLabelShort,
     EPhoneOutgoingCallLabel,
--- a/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiutils/src/cphoneresourceresolverbase.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -964,10 +964,6 @@
             retVal = R_PHONE_EXIT_EMERGENCY_MODE_QUERY;
             break;
 
-        case EPhoneIncomingCallKeysLocked:
-            retVal = R_NOTETEXT_USE_KEYGUARD_TO_UNLOCK;
-            break;
-
         case EPhoneIncomingCallLabel:
             retVal = R_PHONEUI_MTCAL_INCOMING_CALL;
             break;
--- a/phoneapp/phoneuiutils/src/cphonetimer.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiutils/src/cphonetimer.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include "cphonetimer.h"
 #include "phoneui.pan"
-#include "phonelogger.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -31,7 +30,6 @@
 CPhoneTimer::CPhoneTimer( TInt aPriority ) :
     CTimer( aPriority)
     {
-    __LOGMETHODSTARTEND(EPhoneUIUtils, "CPhoneTimer::CPhoneTimer() ");
     CActiveScheduler::Add( this );
     }
 
@@ -41,7 +39,6 @@
 //
 void CPhoneTimer::ConstructL()
     {
-    __LOGMETHODSTARTEND(EPhoneUIUtils, "CPhoneTimer::ConstructL() ");
     CTimer::ConstructL();
     }
 
@@ -51,7 +48,6 @@
 //
 EXPORT_C CPhoneTimer* CPhoneTimer::NewL( TInt aPriority )
     {
-    __LOGMETHODSTARTEND(EPhoneUIUtils, "CPhoneTimer::NewL() ");
     CPhoneTimer* self = new (ELeave) CPhoneTimer( aPriority );
     
     CleanupStack::PushL( self );
@@ -67,7 +63,6 @@
 //
 EXPORT_C CPhoneTimer::~CPhoneTimer()
     {
-    __LOGMETHODSTARTEND(EPhoneUIUtils, "CPhoneTimer::~CPhoneTimer() ");
     Cancel();    
     }
 
@@ -77,10 +72,6 @@
 //
 void CPhoneTimer::RunL()
     {
-    __PHONELOG1( EBasic, EPhoneUIUtils, 
-        "CPhoneTimer::RunL iStatus(%d)", 
-        iStatus.Int() );
-    
     if ( iStatus != KErrNone )
         {
         //error code is ignored, as CPeriodic. 
@@ -89,14 +80,10 @@
    
     if ( !iTimerObserver )
         {
-        __PHONELOG( EBasic, EPhoneUIUtils, 
-            "CPhoneTimer::RunL CallBack" );
         iCallBack.CallBack();
         }
     else
         {
-        __PHONELOG( EBasic, EPhoneUIUtils, 
-            "CPhoneTimer::RunL HandleTimeOutL" );
         iTimerObserver->HandleTimeOutL();
         }
     }
@@ -109,7 +96,6 @@
     TTimeIntervalMicroSeconds32 anInterval, 
     TCallBack aCallBack )
     {
-    __LOGMETHODSTARTEND(EPhoneUIUtils, "CPhoneTimer::After() ");
     
     if ( IsActive() )
         {
@@ -129,7 +115,6 @@
     TTimeIntervalMicroSeconds32 anInterval, 
     MPhoneTimer* aObserver )
     {
-    __LOGMETHODSTARTEND(EPhoneUIUtils, "CPhoneTimer::After() ");
     
     __ASSERT_DEBUG( aObserver, Panic( EPhoneUtilsParameterNotInitialized ) );
     
@@ -147,7 +132,6 @@
 //
 EXPORT_C void CPhoneTimer::CancelTimer()
     {
-    __LOGMETHODSTARTEND(EPhoneUIUtils, "CPhoneTimer::CancelTimer() ");
     Cancel();
     }
 
@@ -157,7 +141,6 @@
 //
 void CPhoneTimer::DoCancel()
     {
-    __LOGMETHODSTARTEND(EPhoneUIUtils, "CPhoneTimer::DoCancel() ");
     iTimerObserver = NULL;
     CTimer::DoCancel();
     }
--- a/phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -139,98 +139,95 @@
 _STLIT8(K110, "EPhoneViewGetSecurityModeStatus");
 _STLIT8(K111, "EPhoneViewSetStatusPaneVisible");
 _STLIT8(K112, "EPhoneViewEnableKeyLock");
-_STLIT8(K113, "EPhoneViewEnableKeyLockWithoutNote");
-_STLIT8(K114, "EPhoneViewLaunchFaxModem");
-_STLIT8(K115, "EPhoneViewUpdateFSW");
-_STLIT8(K116, "EPhoneViewIsQuery");
-_STLIT8(K117, "EPhoneViewBringIdleToForeground");
-_STLIT8(K118, "EPhoneViewSetIdleTopApplication");
-_STLIT8(K119, "EPhoneViewBeginUpdate");
-_STLIT8(K120, "EPhoneViewEndUpdate");
-_STLIT8(K121, "EPhoneViewSetConfrenceOptionsFlag");
-_STLIT8(K122, "EPhoneViewRemoveConferenceBubble");
-_STLIT8(K123, "EPhoneViewGetSoftRejectWindowGroupId");
-_STLIT8(K124, "EPhoneViewSetTouchPaneButtons");
-_STLIT8(K125, "EPhoneViewSetTouchPaneVisible");
-_STLIT8(K126, "EPhoneViewEnableTouchButton");
-_STLIT8(K127, "EPhoneViewDisableTouchButton");
-_STLIT8(K128, "EPhoneResetTouchButtons");
-_STLIT8(K129, "EPhoneViewGetIsConferenceInSelectionMode");
-_STLIT8(K130, "EPhoneViewIsStraightCallToVideoMailBox");
-_STLIT8(K131, "EPhoneViewSetDtmfDialerViewVisible");
-_STLIT8(K132, "EPhoneViewSetRestrictedDialer");
-_STLIT8(K133, "EPhoneViewIsConferenceInExpandedMode");
-_STLIT8(K134, "EPhoneViewIsMenuBarVisible");
-_STLIT8(K135, "EPhoneViewGetBlockingDialogStatus");
-_STLIT8(K136, "EPhoneViewYesSingleItemFetch");
-_STLIT8(K137, "EPhoneViewNoSingleItemFetch");
-_STLIT8(K138, "EPhoneViewGetLocalizedNumberFromEntry");
-_STLIT8(K139, "EPhoneViewIsNoteActive");
-_STLIT8(K140, "EPhoneViewOpenNumberEntry");
-_STLIT8(K141, "EPhoneViewOpenCallHandling");
-_STLIT8(K142, "EPhoneViewGetConferenceAndSingleFlag");
-_STLIT8(K143, "EPhoneViewSetConferenceAndSingleFlag");
-_STLIT8(K144, "EPhoneViewSetVideoCallFlag");
-_STLIT8(K145, "EPhoneViewSetDtmfOptionsFlag");
-_STLIT8(K146, "EPhoneViewShowVTSetupFailedCreateCallToSameContactQuery");
-_STLIT8(K147, "EPhoneViewGetAudioVolumeLevel");
-_STLIT8(K148, "EPhoneViewIsIdleTopApp");
-_STLIT8(K149, "EPhoneViewUpdateToolbar");
-_STLIT8(K150, "EPhoneViewSetControlAndVisibility");
-_STLIT8(K151, "EPhoneViewAllowWaitingCallHeader");
-_STLIT8(K152, "EPhoneViewBeginTransEffect");
-_STLIT8(K153, "EPhoneViewEndTransEffect");
-_STLIT8(K154, "EPhoneViewSetDialerControlVisible");
-_STLIT8(K155, "EPhoneViewCloseSingleItemFetchDialog");
-_STLIT8(K156, "EPhoneViewGetActivatePreviousApp");
-_STLIT8(K157, "EPhoneViewActivatePreviousApp");
-_STLIT8(K158, "EPhoneViewSetPointerCapture");
-_STLIT8(K159, "EPhoneViewSetSendKeyDialerActivationFlag");
-_STLIT8(K160, "EPhoneViewPrepareIcons");
-_STLIT8(K161, "EPhoneViewKeypadAudioEnabled");
-_STLIT8(K162, "EPhoneViewKeypadAudioDisabled");
-_STLIT8(K163, "EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel");
-_STLIT8(K164, "EPhoneViewRemoveDtmfNote");
-_STLIT8(K165, "EPhoneViewUpdatePhoneIconToFSW");
-_STLIT8(K166, "EPhoneViewSetEikonNotifiersDisabled");
-_STLIT8(K167, "EPhoneViewCancelAllNotications");
-_STLIT8(K168, "EPhoneViewSetVideoCallDTMFVisibilityFlag");
-_STLIT8(K169, "EPhoneViewIsKeyLockEnabled");
-_STLIT8(K170, "EPhoneViewDisableKeyLock");
-_STLIT8(K171, "EPhoneViewLoadPlugins");
-_STLIT8(K172, "PhoneViewServiceSelection");
-_STLIT8(K173, "EPhoneViewOpenVirtualKeyBoard");
-_STLIT8(K174, "EPhoneViewUpdateNoteSoftkeys");
-_STLIT8(K175, "EPhoneViewShowCustomizedDialer");
-_STLIT8(K176, "EPhoneViewHideCustomizedDialer");
-_STLIT8(K177, "EPhoneViewGetCustomizedDialerMenuResourceId");
-_STLIT8(K178, "EPhoneViewGetCustomizedDialerCbaResourceId");
-_STLIT8(K179, "EPhoneViewCreatePhoneBookServices");
-_STLIT8(K180, "EPhoneViewDisableKeyLockWithoutNote");
-_STLIT8(K181, "EPhoneViewGetKeyLockStatus");
-_STLIT8(K182, "EPhoneViewSetNumberEntryObserver");
-_STLIT8(K183, "EPhoneViewGetSingleItemFetchType");
-_STLIT8(K184, "EPhoneViewRemoveGlobalWaitNote");
-_STLIT8(K185, "EPhoneViewSetPhoneCustomization");
-_STLIT8(K186, "EPhoneViewSetViewCustomization");
-_STLIT8(K187, "EPhoneViewSetButtonCustomization");
-_STLIT8(K188, "EPhoneViewUpdateContactByString");
-_STLIT8(K189, "EPhoneViewAddContactByString");
-_STLIT8(K190, "EPhoneViewIsActiveNoteDissmissableByKeyEvent");
-_STLIT8(K191, "EPhoneViewSetNoConnectedCalls");
-_STLIT8(K192, "EPhoneViewIsDTMFEditorVisible");
-_STLIT8(K193, "EPhoneViewSetToolbarDimming");
-_STLIT8(K194, "EPhoneViewEnableToolbarButton");
-_STLIT8(K195, "EPhoneViewHideToolbar");
-_STLIT8(K196, "EPhoneViewShowToolbar");
-_STLIT8(K197, "EPhoneViewGetEasyDialingInFocusStatus");
-_STLIT8(K198, "EPhoneViewSetInvalidCsPhoneNumberFlag");
-_STLIT8(K199, "EPhoneViewGetInvalidCsPhoneNumberFlag");
-_STLIT8(K200, "EPhoneViewGetEasyDialingMenuId");
-_STLIT8(K201, "EPhoneViewGetEasyDialingCbaId");
-_STLIT8(K202, "EPhoneViewGetNeedToReturnToForegroundAppStatus");
-_STLIT8(K203, "EPhoneViewSetNeedToReturnToForegroundAppStatus");
-_STLIT8(K204, ", // Don't remove this, this should always be the last in list.");
+_STLIT8(K113, "EPhoneViewLaunchFaxModem");
+_STLIT8(K114, "EPhoneViewUpdateFSW");
+_STLIT8(K115, "EPhoneViewIsQuery");
+_STLIT8(K116, "EPhoneViewBringIdleToForeground");
+_STLIT8(K117, "EPhoneViewSetIdleTopApplication");
+_STLIT8(K118, "EPhoneViewBeginUpdate");
+_STLIT8(K119, "EPhoneViewEndUpdate");
+_STLIT8(K120, "EPhoneViewSetConfrenceOptionsFlag");
+_STLIT8(K121, "EPhoneViewRemoveConferenceBubble");
+_STLIT8(K122, "EPhoneViewGetSoftRejectWindowGroupId");
+_STLIT8(K123, "EPhoneViewSetTouchPaneButtons");
+_STLIT8(K124, "EPhoneViewSetTouchPaneVisible");
+_STLIT8(K125, "EPhoneViewEnableTouchButton");
+_STLIT8(K126, "EPhoneViewDisableTouchButton");
+_STLIT8(K127, "EPhoneResetTouchButtons");
+_STLIT8(K128, "EPhoneViewGetIsConferenceInSelectionMode");
+_STLIT8(K129, "EPhoneViewIsStraightCallToVideoMailBox");
+_STLIT8(K130, "EPhoneViewSetDtmfDialerViewVisible");
+_STLIT8(K131, "EPhoneViewSetRestrictedDialer");
+_STLIT8(K132, "EPhoneViewIsConferenceInExpandedMode");
+_STLIT8(K133, "EPhoneViewIsMenuBarVisible");
+_STLIT8(K134, "EPhoneViewGetBlockingDialogStatus");
+_STLIT8(K135, "EPhoneViewYesSingleItemFetch");
+_STLIT8(K136, "EPhoneViewNoSingleItemFetch");
+_STLIT8(K137, "EPhoneViewGetLocalizedNumberFromEntry");
+_STLIT8(K138, "EPhoneViewIsNoteActive");
+_STLIT8(K139, "EPhoneViewOpenNumberEntry");
+_STLIT8(K140, "EPhoneViewOpenCallHandling");
+_STLIT8(K141, "EPhoneViewGetConferenceAndSingleFlag");
+_STLIT8(K142, "EPhoneViewSetConferenceAndSingleFlag");
+_STLIT8(K143, "EPhoneViewSetVideoCallFlag");
+_STLIT8(K144, "EPhoneViewSetDtmfOptionsFlag");
+_STLIT8(K145, "EPhoneViewShowVTSetupFailedCreateCallToSameContactQuery");
+_STLIT8(K146, "EPhoneViewGetAudioVolumeLevel");
+_STLIT8(K147, "EPhoneViewIsIdleTopApp");
+_STLIT8(K148, "EPhoneViewUpdateToolbar");
+_STLIT8(K149, "EPhoneViewSetControlAndVisibility");
+_STLIT8(K150, "EPhoneViewAllowWaitingCallHeader");
+_STLIT8(K151, "EPhoneViewBeginTransEffect");
+_STLIT8(K152, "EPhoneViewEndTransEffect");
+_STLIT8(K153, "EPhoneViewSetDialerControlVisible");
+_STLIT8(K154, "EPhoneViewCloseSingleItemFetchDialog");
+_STLIT8(K155, "EPhoneViewGetActivatePreviousApp");
+_STLIT8(K156, "EPhoneViewActivatePreviousApp");
+_STLIT8(K157, "EPhoneViewSetPointerCapture");
+_STLIT8(K158, "EPhoneViewSetSendKeyDialerActivationFlag");
+_STLIT8(K159, "EPhoneViewPrepareIcons");
+_STLIT8(K160, "EPhoneViewKeypadAudioEnabled");
+_STLIT8(K161, "EPhoneViewKeypadAudioDisabled");
+_STLIT8(K162, "EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel");
+_STLIT8(K163, "EPhoneViewRemoveDtmfNote");
+_STLIT8(K164, "EPhoneViewUpdatePhoneIconToFSW");
+_STLIT8(K165, "EPhoneViewSetEikonNotifiersDisabled");
+_STLIT8(K166, "EPhoneViewCancelAllNotications");
+_STLIT8(K167, "EPhoneViewSetVideoCallDTMFVisibilityFlag");
+_STLIT8(K168, "EPhoneViewLoadPlugins");
+_STLIT8(K169, "PhoneViewServiceSelection");
+_STLIT8(K170, "EPhoneViewOpenVirtualKeyBoard");
+_STLIT8(K171, "EPhoneViewUpdateNoteSoftkeys");
+_STLIT8(K172, "EPhoneViewShowCustomizedDialer");
+_STLIT8(K173, "EPhoneViewHideCustomizedDialer");
+_STLIT8(K174, "EPhoneViewGetCustomizedDialerMenuResourceId");
+_STLIT8(K175, "EPhoneViewGetCustomizedDialerCbaResourceId");
+_STLIT8(K176, "EPhoneViewCreatePhoneBookServices");
+_STLIT8(K177, "EPhoneViewDisableKeyLockWithoutNote");
+_STLIT8(K178, "EPhoneViewGetKeyLockStatus");
+_STLIT8(K179, "EPhoneViewSetNumberEntryObserver");
+_STLIT8(K180, "EPhoneViewGetSingleItemFetchType");
+_STLIT8(K181, "EPhoneViewRemoveGlobalWaitNote");
+_STLIT8(K182, "EPhoneViewSetPhoneCustomization");
+_STLIT8(K183, "EPhoneViewSetViewCustomization");
+_STLIT8(K184, "EPhoneViewSetButtonCustomization");
+_STLIT8(K185, "EPhoneViewUpdateContactByString");
+_STLIT8(K186, "EPhoneViewAddContactByString");
+_STLIT8(K187, "EPhoneViewIsActiveNoteDissmissableByKeyEvent");
+_STLIT8(K188, "EPhoneViewSetNoConnectedCalls");
+_STLIT8(K189, "EPhoneViewIsDTMFEditorVisible");
+_STLIT8(K190, "EPhoneViewSetToolbarDimming");
+_STLIT8(K191, "EPhoneViewEnableToolbarButton");
+_STLIT8(K192, "EPhoneViewHideToolbar");
+_STLIT8(K193, "EPhoneViewShowToolbar");
+_STLIT8(K194, "EPhoneViewGetEasyDialingInFocusStatus");
+_STLIT8(K195, "EPhoneViewSetInvalidCsPhoneNumberFlag");
+_STLIT8(K196, "EPhoneViewGetInvalidCsPhoneNumberFlag");
+_STLIT8(K197, "EPhoneViewGetEasyDialingMenuId");
+_STLIT8(K198, "EPhoneViewGetEasyDialingCbaId");
+_STLIT8(K199, "EPhoneViewGetNeedToReturnToForegroundAppStatus");
+_STLIT8(K200, "EPhoneViewSetNeedToReturnToForegroundAppStatus");
+_STLIT8(K201, ", // Don't remove this, this should always be the last in list.");
 
 // Intermediate
 const void * const KStringPointers[] =
@@ -435,11 +432,8 @@
 	(const void*)&K198,
 	(const void*)&K199,
 	(const void*)&K200,
-	(const void*)&K201,
-	(const void*)&K202,
-	(const void*)&K203,
-	(const void*)&K204
+	(const void*)&K201
 	};
 
-const TStringTable PhoneLoggerviewCommands::Table = {204, KStringPointers, EFalse};
+const TStringTable PhoneLoggerviewCommands::Table = {201, KStringPointers, EFalse};
 
--- a/phoneapp/phoneuiutils/src/phoneloggerviewcommands.st	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiutils/src/phoneloggerviewcommands.st	Mon Mar 15 12:40:24 2010 +0200
@@ -112,7 +112,6 @@
 EPhoneViewGetSecurityModeStatus EPhoneViewGetSecurityModeStatus
 EPhoneViewSetStatusPaneVisible EPhoneViewSetStatusPaneVisible
 EPhoneViewEnableKeyLock EPhoneViewEnableKeyLock
-EPhoneViewEnableKeyLockWithoutNote EPhoneViewEnableKeyLockWithoutNote
 EPhoneViewLaunchFaxModem EPhoneViewLaunchFaxModem
 EPhoneViewUpdateFSW EPhoneViewUpdateFSW
 EPhoneViewIsQuery EPhoneViewIsQuery
@@ -168,8 +167,6 @@
 EPhoneViewSetEikonNotifiersDisabled EPhoneViewSetEikonNotifiersDisabled
 EPhoneViewCancelAllNotications EPhoneViewCancelAllNotications
 EPhoneViewSetVideoCallDTMFVisibilityFlag EPhoneViewSetVideoCallDTMFVisibilityFlag
-EPhoneViewIsKeyLockEnabled EPhoneViewIsKeyLockEnabled
-EPhoneViewDisableKeyLock EPhoneViewDisableKeyLock
 EPhoneViewLoadPlugins EPhoneViewLoadPlugins
 PhoneViewServiceSelection PhoneViewServiceSelection
 EPhoneViewOpenVirtualKeyBoard EPhoneViewOpenVirtualKeyBoard
--- a/phoneapp/phoneuiview/eabi/phoneuiviewu.def	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/eabi/phoneuiviewu.def	Mon Mar 15 12:40:24 2010 +0200
@@ -22,111 +22,115 @@
 	_ZN20CPhoneViewController4NewLE5TRect @ 21 NONAME
 	_ZN20CPhoneViewController9PhoneViewEv @ 22 NONAME
 	_ZN21CPhoneSingleItemFetch4NewLER9CEikonEnvR20CPhoneViewControllerR23CPhoneContactControllerR16CPhoneStatusPane @ 23 NONAME
-	_ZNK20CPhoneViewController25BlockingDialogIsDisplayedEv @ 24 NONAME
-	_ZTI10CPhoneNote @ 25 NONAME
-	_ZTI10CPhoneView @ 26 NONAME
-	_ZTI15CPhoneTextQuery @ 27 NONAME
-	_ZTI16CPhoneDialerView @ 28 NONAME
-	_ZTI16CPhoneStatusPane @ 29 NONAME
-	_ZTI17CPhoneAudioPlayer @ 30 NONAME
-	_ZTI17CPhoneQueryDialog @ 31 NONAME
-	_ZTI17CPhoneRingingTone @ 32 NONAME
-	_ZTI17CPhoneVmbxHandler @ 33 NONAME
-	_ZTI18CPhoneProgressNote @ 34 NONAME
-	_ZTI19CPhoneBubbleMapping @ 35 NONAME
-	_ZTI19CPhoneBubbleWrapper @ 36 NONAME
-	_ZTI19CPhoneTextTitlePane @ 37 NONAME
-	_ZTI20CPhoneMenuController @ 38 NONAME
-	_ZTI20CPhoneNoteController @ 39 NONAME
-	_ZTI20CPhoneUIDisabledNote @ 40 NONAME
-	_ZTI20CPhoneViewController @ 41 NONAME
-	_ZTI21CPhoneApplicationExit @ 42 NONAME
-	_ZTI21CPhoneAudioController @ 43 NONAME
-	_ZTI21CPhoneBubbleExtension @ 44 NONAME
-	_ZTI21CPhoneDtmfSendingNote @ 45 NONAME
-	_ZTI21CPhoneIncallIndicator @ 46 NONAME
-	_ZTI21CPhoneListQueryDialog @ 47 NONAME
-	_ZTI21CPhoneQueryController @ 48 NONAME
-	_ZTI21CPhoneSingleItemFetch @ 49 NONAME
-	_ZTI23CPhoneContactController @ 50 NONAME
-	_ZTI25CPhoneBubbleExtensionData @ 51 NONAME
-	_ZTI25CPhoneDtmfNumberListQuery @ 52 NONAME
-	_ZTI25CPhoneRingingTonePlayerAO @ 53 NONAME
-	_ZTI26CPhoneKeyCaptureController @ 54 NONAME
-	_ZTI28CPhoneBubbleExtensionManager @ 55 NONAME
-	_ZTI29CPhoneCallHeaderTextAnimation @ 56 NONAME
-	_ZTIN21CPhoneApplicationExit11CElementUidE @ 57 NONAME
-	_ZTIN21CPhoneApplicationExit13CElementBasicE @ 58 NONAME
-	_ZTIN21CPhoneApplicationExit13CElementDriveE @ 59 NONAME
-	_ZTV10CPhoneNote @ 60 NONAME
-	_ZTV10CPhoneView @ 61 NONAME
-	_ZTV15CPhoneTextQuery @ 62 NONAME
-	_ZTV16CPhoneDialerView @ 63 NONAME
-	_ZTV16CPhoneStatusPane @ 64 NONAME
-	_ZTV17CPhoneAudioPlayer @ 65 NONAME
-	_ZTV17CPhoneQueryDialog @ 66 NONAME
-	_ZTV17CPhoneRingingTone @ 67 NONAME
-	_ZTV17CPhoneVmbxHandler @ 68 NONAME
-	_ZTV18CPhoneProgressNote @ 69 NONAME
-	_ZTV19CPhoneBubbleMapping @ 70 NONAME
-	_ZTV19CPhoneBubbleWrapper @ 71 NONAME
-	_ZTV19CPhoneTextTitlePane @ 72 NONAME
-	_ZTV20CPhoneMenuController @ 73 NONAME
-	_ZTV20CPhoneNoteController @ 74 NONAME
-	_ZTV20CPhoneUIDisabledNote @ 75 NONAME
-	_ZTV20CPhoneViewController @ 76 NONAME
-	_ZTV21CPhoneApplicationExit @ 77 NONAME
-	_ZTV21CPhoneAudioController @ 78 NONAME
-	_ZTV21CPhoneBubbleExtension @ 79 NONAME
-	_ZTV21CPhoneDtmfSendingNote @ 80 NONAME
-	_ZTV21CPhoneIncallIndicator @ 81 NONAME
-	_ZTV21CPhoneListQueryDialog @ 82 NONAME
-	_ZTV21CPhoneQueryController @ 83 NONAME
-	_ZTV21CPhoneSingleItemFetch @ 84 NONAME
-	_ZTV23CPhoneContactController @ 85 NONAME
-	_ZTV25CPhoneBubbleExtensionData @ 86 NONAME
-	_ZTV25CPhoneDtmfNumberListQuery @ 87 NONAME
-	_ZTV25CPhoneRingingTonePlayerAO @ 88 NONAME
-	_ZTV26CPhoneKeyCaptureController @ 89 NONAME
-	_ZTV28CPhoneBubbleExtensionManager @ 90 NONAME
-	_ZTV29CPhoneCallHeaderTextAnimation @ 91 NONAME
-	_ZTVN21CPhoneApplicationExit11CElementUidE @ 92 NONAME
-	_ZTVN21CPhoneApplicationExit13CElementBasicE @ 93 NONAME
-	_ZTVN21CPhoneApplicationExit13CElementDriveE @ 94 NONAME
-	_ZThn12_N20CPhoneViewController28SetBlockingDialogIsDisplayedEi @ 95 NONAME
-	_ZThn4_N20CPhoneViewController12FetchContentEv @ 96 NONAME
-	_ZThn4_N20CPhoneViewController14ExecuteCommandEi @ 97 NONAME
-	_ZThn4_N20CPhoneViewController14ExecuteCommandEiP18TPhoneCommandParam @ 98 NONAME
-	_ZThn4_N20CPhoneViewController14HandleCommandLEi @ 99 NONAME
-	_ZThn4_N20CPhoneViewController14HandleCommandLEiP18TPhoneCommandParam @ 100 NONAME
-	_ZThn4_N20CPhoneViewController15ExecuteCommandLEi @ 101 NONAME
-	_ZThn4_N20CPhoneViewController15ExecuteCommandLEiP18TPhoneCommandParam @ 102 NONAME
-	_ZThn4_N20CPhoneViewController15ExecuteCommandLEii @ 103 NONAME
-	_ZThn4_N20CPhoneViewController15ExecuteCommandLEiiP18TPhoneCommandParam @ 104 NONAME
-	_ZThn4_N20CPhoneViewController15ExecuteCommandLEiiR7TDesC16 @ 105 NONAME
-	_ZTI22CPhoneDialerController @ 106 NONAME
-	_ZTV22CPhoneDialerController @ 107 NONAME
-	_ZN22CPhoneDialerController10ConstructLEv @ 108 NONAME
-	_ZN22CPhoneDialerController21SetNumberEntryIsEmptyEi @ 109 NONAME
-	_ZN22CPhoneDialerController22NumberEntryPromptTextLEv @ 110 NONAME
-	_ZN22CPhoneDialerControllerC1EP19CPhoneBubbleWrapperR7CCoeEnv @ 111 NONAME
-	_ZN22CPhoneDialerControllerC2EP19CPhoneBubbleWrapperR7CCoeEnv @ 112 NONAME
-	_ZN22CPhoneDialerControllerD0Ev @ 113 NONAME
-	_ZN22CPhoneDialerControllerD1Ev @ 114 NONAME
-	_ZN22CPhoneDialerControllerD2Ev @ 115 NONAME
-	_ZNK22CPhoneDialerController11ButtonStateEN22MPhoneDialerController12TButtonIndexE @ 116 NONAME
-	_ZNK22CPhoneDialerController12ButtonDimmedEN22MPhoneDialerController12TButtonIndexE @ 117 NONAME
-	_ZNK22CPhoneDialerController13CbaResourceIdEv @ 118 NONAME
-	_ZNK22CPhoneDialerController13GetButtonDataEN22MPhoneDialerController12TButtonIndexER13RPointerArrayINS0_11CButtonDataEE @ 119 NONAME
-	_ZNK22CPhoneDialerController14MenuResourceIdEv @ 120 NONAME
-	_ZNK22CPhoneDialerController18EasyDialingAllowedEv @ 121 NONAME
-	_ZNK22CPhoneDialerController19EmergencyCallActiveEv @ 122 NONAME
-	_ZThn4_N22CPhoneDialerController21SetNumberEntryIsEmptyEi @ 123 NONAME
-	_ZThn4_N22CPhoneDialerController22NumberEntryPromptTextLEv @ 124 NONAME
-	_ZThn4_NK22CPhoneDialerController11ButtonStateEN22MPhoneDialerController12TButtonIndexE @ 125 NONAME
-	_ZThn4_NK22CPhoneDialerController12ButtonDimmedEN22MPhoneDialerController12TButtonIndexE @ 126 NONAME
-	_ZThn4_NK22CPhoneDialerController13CbaResourceIdEv @ 127 NONAME
-	_ZThn4_NK22CPhoneDialerController14MenuResourceIdEv @ 128 NONAME
-	_ZThn4_NK22CPhoneDialerController18EasyDialingAllowedEv @ 129 NONAME
-	_ZThn4_NK22CPhoneDialerController13GetButtonDataEN22MPhoneDialerController12TButtonIndexER13RPointerArrayINS0_11CButtonDataEE @ 130 NONAME
+	_ZN22CPhoneDialerController10ConstructLEv @ 24 NONAME
+	_ZN22CPhoneDialerController21SetNumberEntryIsEmptyEi @ 25 NONAME
+	_ZN22CPhoneDialerController22NumberEntryPromptTextLEv @ 26 NONAME
+	_ZN22CPhoneDialerControllerC1EP19CPhoneBubbleWrapperR7CCoeEnv @ 27 NONAME
+	_ZN22CPhoneDialerControllerC2EP19CPhoneBubbleWrapperR7CCoeEnv @ 28 NONAME
+	_ZN22CPhoneDialerControllerD0Ev @ 29 NONAME
+	_ZN22CPhoneDialerControllerD1Ev @ 30 NONAME
+	_ZN22CPhoneDialerControllerD2Ev @ 31 NONAME
+	_ZNK20CPhoneViewController25BlockingDialogIsDisplayedEv @ 32 NONAME
+	_ZNK22CPhoneDialerController11ButtonStateEN22MPhoneDialerController12TButtonIndexE @ 33 NONAME
+	_ZNK22CPhoneDialerController12ButtonDimmedEN22MPhoneDialerController12TButtonIndexE @ 34 NONAME
+	_ZNK22CPhoneDialerController13CbaResourceIdEv @ 35 NONAME
+	_ZNK22CPhoneDialerController13GetButtonDataEN22MPhoneDialerController12TButtonIndexER13RPointerArrayINS0_11CButtonDataEE @ 36 NONAME
+	_ZNK22CPhoneDialerController14MenuResourceIdEv @ 37 NONAME
+	_ZNK22CPhoneDialerController18EasyDialingAllowedEv @ 38 NONAME
+	_ZNK22CPhoneDialerController19EmergencyCallActiveEv @ 39 NONAME
+	_ZTI10CPhoneNote @ 40 NONAME
+	_ZTI10CPhoneView @ 41 NONAME
+	_ZTI15CPhoneTextQuery @ 42 NONAME
+	_ZTI16CPhoneDialerView @ 43 NONAME
+	_ZTI16CPhoneStatusPane @ 44 NONAME
+	_ZTI17CPhoneAudioPlayer @ 45 NONAME
+	_ZTI17CPhoneQueryDialog @ 46 NONAME
+	_ZTI17CPhoneRingingTone @ 47 NONAME
+	_ZTI17CPhoneVmbxHandler @ 48 NONAME
+	_ZTI18CPhoneProgressNote @ 49 NONAME
+	_ZTI19CPhoneBubbleMapping @ 50 NONAME
+	_ZTI19CPhoneBubbleWrapper @ 51 NONAME
+	_ZTI19CPhoneTextTitlePane @ 52 NONAME
+	_ZTI20CPhoneMenuController @ 53 NONAME
+	_ZTI20CPhoneNoteController @ 54 NONAME
+	_ZTI20CPhoneViewController @ 55 NONAME
+	_ZTI21CPhoneApplicationExit @ 56 NONAME
+	_ZTI21CPhoneAudioController @ 57 NONAME
+	_ZTI21CPhoneBubbleExtension @ 58 NONAME
+	_ZTI21CPhoneDtmfSendingNote @ 59 NONAME
+	_ZTI21CPhoneIncallIndicator @ 60 NONAME
+	_ZTI21CPhoneListQueryDialog @ 61 NONAME
+	_ZTI21CPhoneQueryController @ 62 NONAME
+	_ZTI21CPhoneSingleItemFetch @ 63 NONAME
+	_ZTI22CPhoneDialerController @ 64 NONAME
+	_ZTI23CPhoneContactController @ 65 NONAME
+	_ZTI25CPhoneBubbleExtensionData @ 66 NONAME
+	_ZTI25CPhoneDtmfNumberListQuery @ 67 NONAME
+	_ZTI25CPhoneRingingTonePlayerAO @ 68 NONAME
+	_ZTI26CPhoneKeyCaptureController @ 69 NONAME
+	_ZTI28CPhoneBubbleExtensionManager @ 70 NONAME
+	_ZTI29CPhoneCallHeaderTextAnimation @ 71 NONAME
+	_ZTIN21CPhoneApplicationExit11CElementUidE @ 72 NONAME
+	_ZTIN21CPhoneApplicationExit13CElementBasicE @ 73 NONAME
+	_ZTIN21CPhoneApplicationExit13CElementDriveE @ 74 NONAME
+	_ZTV10CPhoneNote @ 75 NONAME
+	_ZTV10CPhoneView @ 76 NONAME
+	_ZTV15CPhoneTextQuery @ 77 NONAME
+	_ZTV16CPhoneDialerView @ 78 NONAME
+	_ZTV16CPhoneStatusPane @ 79 NONAME
+	_ZTV17CPhoneAudioPlayer @ 80 NONAME
+	_ZTV17CPhoneQueryDialog @ 81 NONAME
+	_ZTV17CPhoneRingingTone @ 82 NONAME
+	_ZTV17CPhoneVmbxHandler @ 83 NONAME
+	_ZTV18CPhoneProgressNote @ 84 NONAME
+	_ZTV19CPhoneBubbleMapping @ 85 NONAME
+	_ZTV19CPhoneBubbleWrapper @ 86 NONAME
+	_ZTV19CPhoneTextTitlePane @ 87 NONAME
+	_ZTV20CPhoneMenuController @ 88 NONAME
+	_ZTV20CPhoneNoteController @ 89 NONAME
+	_ZTV20CPhoneViewController @ 90 NONAME
+	_ZTV21CPhoneApplicationExit @ 91 NONAME
+	_ZTV21CPhoneAudioController @ 92 NONAME
+	_ZTV21CPhoneBubbleExtension @ 93 NONAME
+	_ZTV21CPhoneDtmfSendingNote @ 94 NONAME
+	_ZTV21CPhoneIncallIndicator @ 95 NONAME
+	_ZTV21CPhoneListQueryDialog @ 96 NONAME
+	_ZTV21CPhoneQueryController @ 97 NONAME
+	_ZTV21CPhoneSingleItemFetch @ 98 NONAME
+	_ZTV22CPhoneDialerController @ 99 NONAME
+	_ZTV23CPhoneContactController @ 100 NONAME
+	_ZTV25CPhoneBubbleExtensionData @ 101 NONAME
+	_ZTV25CPhoneDtmfNumberListQuery @ 102 NONAME
+	_ZTV25CPhoneRingingTonePlayerAO @ 103 NONAME
+	_ZTV26CPhoneKeyCaptureController @ 104 NONAME
+	_ZTV28CPhoneBubbleExtensionManager @ 105 NONAME
+	_ZTV29CPhoneCallHeaderTextAnimation @ 106 NONAME
+	_ZTVN21CPhoneApplicationExit11CElementUidE @ 107 NONAME
+	_ZTVN21CPhoneApplicationExit13CElementBasicE @ 108 NONAME
+	_ZTVN21CPhoneApplicationExit13CElementDriveE @ 109 NONAME
+	_ZThn12_N20CPhoneViewController28SetBlockingDialogIsDisplayedEi @ 110 NONAME
+	_ZThn4_N20CPhoneViewController12FetchContentEv @ 111 NONAME
+	_ZThn4_N20CPhoneViewController14ExecuteCommandEi @ 112 NONAME
+	_ZThn4_N20CPhoneViewController14ExecuteCommandEiP18TPhoneCommandParam @ 113 NONAME
+	_ZThn4_N20CPhoneViewController14HandleCommandLEi @ 114 NONAME
+	_ZThn4_N20CPhoneViewController14HandleCommandLEiP18TPhoneCommandParam @ 115 NONAME
+	_ZThn4_N20CPhoneViewController15ExecuteCommandLEi @ 116 NONAME
+	_ZThn4_N20CPhoneViewController15ExecuteCommandLEiP18TPhoneCommandParam @ 117 NONAME
+	_ZThn4_N20CPhoneViewController15ExecuteCommandLEii @ 118 NONAME
+	_ZThn4_N20CPhoneViewController15ExecuteCommandLEiiP18TPhoneCommandParam @ 119 NONAME
+	_ZThn4_N20CPhoneViewController15ExecuteCommandLEiiR7TDesC16 @ 120 NONAME
+	_ZThn4_N22CPhoneDialerController21SetNumberEntryIsEmptyEi @ 121 NONAME
+	_ZThn4_N22CPhoneDialerController22NumberEntryPromptTextLEv @ 122 NONAME
+	_ZThn4_NK22CPhoneDialerController11ButtonStateEN22MPhoneDialerController12TButtonIndexE @ 123 NONAME
+	_ZThn4_NK22CPhoneDialerController12ButtonDimmedEN22MPhoneDialerController12TButtonIndexE @ 124 NONAME
+	_ZThn4_NK22CPhoneDialerController13CbaResourceIdEv @ 125 NONAME
+	_ZThn4_NK22CPhoneDialerController13GetButtonDataEN22MPhoneDialerController12TButtonIndexER13RPointerArrayINS0_11CButtonDataEE @ 126 NONAME
+	_ZThn4_NK22CPhoneDialerController14MenuResourceIdEv @ 127 NONAME
+	_ZThn4_NK22CPhoneDialerController18EasyDialingAllowedEv @ 128 NONAME
+	_ZTI23CPhoneRingingToneServer @ 129 NONAME
+	_ZTI28CPhoneRingingToneSrvPlayerAO @ 130 NONAME
+	_ZTI30CPhoneRingingToneServerSession @ 131 NONAME
+	_ZTV23CPhoneRingingToneServer @ 132 NONAME
+	_ZTV28CPhoneRingingToneSrvPlayerAO @ 133 NONAME
+	_ZTV30CPhoneRingingToneServerSession @ 134 NONAME
 
--- a/phoneapp/phoneuiview/group/phoneuiview.mmp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/group/phoneuiview.mmp	Mon Mar 15 12:40:24 2010 +0200
@@ -42,7 +42,6 @@
 SOURCE          cphonekeycapturecontroller.cpp
 SOURCE          cphonemenucontroller.cpp
 SOURCE          cphonenote.cpp
-SOURCE          cphoneuidisablednote.cpp
 SOURCE          cphonenotecontroller.cpp
 SOURCE          cphoneprogressnote.cpp
 SOURCE          cphonequerycontroller.cpp
@@ -67,6 +66,10 @@
 SOURCE          cphonetoolbarcontroller.cpp
 SOURCE          cphoneeasydialingcontroller.cpp 
 SOURCE          cphonedtmfdialercontroller.cpp 
+SOURCE          phoneringingtonesrvplayerao.cpp
+SOURCE          phoneringingtonesrv.cpp
+SOURCE          phoneringingtonesrvsession.cpp
+SOURCE          phoneringingtoneclient.cpp
 
 /* Languages */
 LANG SC
--- a/phoneapp/phoneuiview/inc/cphonenote.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/inc/cphonenote.h	Mon Mar 15 12:40:24 2010 +0200
@@ -64,6 +64,8 @@
         
     protected:
 
+        void PreLayoutDynInitL();
+        
         TKeyResponse OfferKeyEventL( 
             const TKeyEvent& aKeyEvent,
             TEventCode aType );
--- a/phoneapp/phoneuiview/inc/cphonenotecontroller.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/inc/cphonenotecontroller.h	Mon Mar 15 12:40:24 2010 +0200
@@ -30,7 +30,6 @@
 class CPhoneTimer;
 class CEikonEnv;
 class CPhoneNote;
-class CPhoneUIDisabledNote;
 
 class CPhoneNoteController : public CBase, public MPhoneTimer
     {
--- a/phoneapp/phoneuiview/inc/cphoneringingtoneplayerao.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/inc/cphoneringingtoneplayerao.h	Mon Mar 15 12:40:24 2010 +0200
@@ -22,12 +22,11 @@
 // INCLUDES
 #include <e32base.h>
 #include <Profile.hrh>
-#include "mphoneaudioplayerobserver.h"
 #include "mphonevideoplayerobserver.h"
 #include "mphonecenrepobserver.h"
-#include "cphoneaudioplayer.h"
 #include "mphonetimer.h"
 #include "mphonevideoplayer.h"
+#include "phoneringingtoneclient.h"
 
 // FORWARD DECLARATIONS
 //class MPhoneRingingToneObserver;
@@ -51,7 +50,6 @@
 class CPhoneRingingTonePlayerAO :
     public CActive,
     public MPhoneCenRepObserver,
-    private MPhoneAudioPlayerObserver,
     private MPhoneTimer,
     private MPhoneVideoPlayerObserver
     {
@@ -60,19 +58,18 @@
         enum TState
             {
             EIdleState,  
-            EDeletingAudioPlayer,
             EDeletingVideoPlayer,
             EPlayingDefaultVideo
             };
 
     public:
-        
+
         /**
         * Two-phased constructor.
         * @return new instance.
         */
         static CPhoneRingingTonePlayerAO* NewL();
-        
+
         /**
         * Destructor.
         */
@@ -86,6 +83,8 @@
 
         /**
         * Play audio ring tone 
+        * @param aVolume Volume used to play the ringing tone.
+        * @param aRingingType Ringing type.
         */
         void PlayAudioRingTone( 
             TInt aVolume, 
@@ -109,7 +108,7 @@
         * @since    S60 5.0
         */
         void PlayUnsecureVoIPTone();
-        
+
         /**
         * Stops playing the ringing tone.
         * Method does not do anything if ringing tone is not playing.
@@ -121,13 +120,13 @@
         * Stream not closed ( If music player was ongoing ) 
         */
         void MuteRingingToneOnAnswer();
-          
+
         /**
         * Continues video playback with muted audio.
         * Ringing tone is stopped.
         */
         void MuteRingingTone();
-          
+
         /**
         * Sets video player.
         * @since Series 60 v3.2
@@ -135,7 +134,6 @@
         */
         void SetVideoPlayer( MPhoneVideoPlayer* aVideoPlayer );
 
-
         /**
         * Play TTS tone simultaneously with Personal or Default tones.
         * This method does not command phone to play TTS immediately. Instead 
@@ -174,15 +172,7 @@
         * @return ETrue if extended security is required.
         */
         TBool ExtendedSecurity() const;
-   
-        /**
-        * This function is called when Mediator receives response to the sent
-        * ShowMultiMediaRingingTone command.
-        * @param aStatus - Standard Symbian error code indicating the
-        *                  success of the command.
-        */
-		    void ShowMultimediaRingingToneResponseL( TInt aStatus );
-		
+
     public: // From MPhoneCenRepObserver
 
         /**
@@ -198,92 +188,36 @@
     private:
 
         /**
-        * Handle the error of audio file player.
-        */
-        virtual void HandleAudioPlayerError( 
-            TPhoneAudioPlayerErrorEvent aEvent, 
-            TInt aError, 
-            TInt aId = KPhoneAudioPlayerNotSpecified );
-
-        /**
-        * Handle audio player initialize complete.
-        */
-        virtual void HandleAudioPlayerInitComplete(
-            TInt aId = KPhoneAudioPlayerNotSpecified );
-
-        /**
-        * Handle auido file playing complete successfully.
-        */
-        virtual void HandlePlayingComplete( 
-            TInt aId = KPhoneAudioPlayerNotSpecified );
-
-        /**
         * @see MPhoneTimer
         */
         virtual void HandleTimeOutL();
 
         /**
-        * HandleVideoPlayerError
+        * This function is called for video player errors.
+        * @param aEvent The error event happend in initializing or playing.
+        * @param aError The error code return by MMF video player. 
         */
         virtual void HandleVideoPlayerError( 
             TPhoneVideoPlayerErrorEvent aEvent,
             TInt aError );
 
         /**
-        * HandleVideoPlayerInitComplete
+        * This function is called when video player initialization complete
         */
         virtual void HandleVideoPlayerInitComplete();
 
         /**
-        * HandleVideoPlayerPlayingComplete
+        * This function is called after the playing completes successfully
         */
         virtual void HandleVideoPlayerPlayingComplete();
 
-        /** 
-        * Enumerates identifiers for each player:
-        * EPlayerAudio - audio
-        * EPlayerBeepOnce - beep once
-        * EPlayerSilent - silent
-        * EPlayerDefault - default
-        * EPlayerBackup - backup
-        *
-        * EPlayerFirst and EPlayerLast are alias
-        * to other identifiers.
-        * EPlayerFirst - first player
-        * EPlayerLast - last player
-        */
-        enum TPlayerId
-            {
-            EPlayerFirst,
-            EPlayerAudio = EPlayerFirst,
-            EPlayerBeepOnce,
-            EPlayerSilent,
-            EPlayerUnsecureVoIP,
-            EPlayerDefault,
-            EPlayerBackup,
-            EPlayerTts, 
-            EPlayerLast = EPlayerTts,
-            EPlayerCount
-            };
-            
-        /**
-        * Enumerates how many times TTs is played
-        * ESaidOnce -once
-        * ESaidTwice twice 
-        */    
-        enum TTtsStatus
-            {
-            ESaidOnce,
-            ESaidTwice
-            };
-
         /**
         * C++ default constructor.
         */
         CPhoneRingingTonePlayerAO();
 
         /**
-        * By default Symbian OS constructor is private.
+        * Symbian 2nd phase constructor.
         */
         void ConstructL();
 
@@ -306,35 +240,6 @@
             TProfileRingingType aRingingType );
 
         /**
-        * Do construct tone.
-        * @param aRingingTone Ringing tone.
-        * @return The instance of the player. NULL is returned if it's failed.
-        */
-        CPhoneAudioPlayer* ConstructTonePlayer( 
-            const CPhoneRingingTone& aRingingTone,
-            TInt aId );
-
-        /**
-        * Handle audio player error.
-        * @param aDelete ETrue if deletion of the player allowed, 
-        *                EFalse otherwise.
-        * @param aSync ETrue if synchronous deletion of players is allowed,
-        *              EFalse otherwise.
-        */
-        void DoHandlePlayerError(
-            TBool aDelete,
-            TBool aSync );
-
-        /**
-        * Convert ringing type from PhoneAppEnging to the ringing type in 
-        * CPhoneAudioPlayer.
-        * @param aRingingType the ringing type form PhoneAppEngine.
-        * @return ringing type of CPhoneAudioPlayer.
-        */
-        CPhoneAudioPlayer::TRingingType ConvertRingingType(
-            TProfileRingingType aRingingType );
-
-        /**
         * Convert ringing type from PhoneAppEnging to the ringing type in 
         * MPhoneVideoPlayer.
         * @since Series 60 3.1
@@ -344,41 +249,6 @@
         MPhoneVideoPlayer::TPlayMode ConvertVideoRingingType(
             TProfileRingingType aRingingType );
 
-        /**
-        * Construct media server and backup tone player.
-        */
-        TInt ConstructPlayers();
-
-        /**
-        * Construct media server and backup tone player.
-        */
-        void ConstructPlayersL();
-
-        /**
-        * Construct sequence players.
-        * @param aPlayer player to be constructed.
-        */
-        void ConstructSequencePlayer(
-            TPlayerId aPlayer );
-
-        /**
-        * Construct sequence players.
-        * @param aPlayer player to be constructed.
-        */
-        void ConstructSequencePlayerL(
-            TPlayerId aPlayer );
-
-        /**
-        * Cleanup players.
-        */
-        void CleanupPlayers();
-
-        /**
-        * Deletes player asynchronoysly.
-        * @param aPlayer player to be deleted.
-        */
-        void DeletePlayerAsync(
-            TPlayerId aPlayer );
        /**
         * Plays default L1 or L2 video ring tone asynchronously.
         * @since Series 60 3.1
@@ -401,49 +271,7 @@
         * @see CActive::DoCancel.
         */
         void DoCancel();
-        
-        /**
-        * Wrapper of DoHandleTtsDelayTimeout, that can be used as TCallback. 
-        * Immediately passes control to DoHandleTtsDelayTimeout method.
-        * @since Series 60 3.0
-        * @param object Object to call DoHandleTtsDelayTimeout() on, . 
-        *        instance of CPhoneRingingTonePlayer.
-        * @return KErrNone.
-        */
-        static TInt HandleTtsDelayTimeout( TAny* object );
-        
-        /**
-        * It is called after TTS delay elapsed. Starts playing TTS.
-        */
-        void DoHandleTtsDelayTimeout();
-        
-        /**
-        * Checks if TTS component should be played for the current ringtone 
-        * playback and initializes the TTS playback. This method is to be 
-        * called from within PlayXXXXTone methods
-        * @since Series 60 3.0
-        * @param aRingingType ringing type
-        */
-        void AddTtsPlaybackIfNeeded( TProfileRingingType aRingingType );
-             
-        /**
-        * Returns currently active player which is used wit TTS player.
-        * @return pointer to CPhoneAudioPlayer.
-        */
-        CPhoneAudioPlayer* GetCurrentlyActiveAudioPlayerWithTTs();   
-         
-        /**
-        * TTs cases only. Calculates new volume and ramptimes
-        * for Ascending TTS ringing case and normal TTS ringing case.
-        * @param aStatus -status of TTs player.
-        */         
-        void SolveNewVolumeAndRamptime( TTtsStatus aStatus );   
-        
-        /**
-        * Retarts currently active ringingtone player.
-        */
-        void ReStartRingingTonePlayer();
-        
+
          /**
          * Checks if ringing tone file's size is larger than the size limit.
          * If size limit is exceeded, default tone is played instead.
@@ -459,13 +287,13 @@
          * Checks if ringing tone file's size is larger than the size limit.
          * @since 3.1
          * @param aFile   File to check.
-         *        aSizeLimitKB  the size limit in kB is set to this variable.
+         * @param aSizeLimitKB  the size limit in kB is set to this variable.
          * @return KErrNone        if the file can be used as a ringing tone.
          *         KErrTooBig        if the file size limit is exceeded.
          *         Other error value if error happened during size checking.
          */
         TInt CheckToneFileSize( const TDesC& aFile, TInt aSizeLimitKB );
-        
+
          /**
          * Reads from central repository the file size limit of following tones:
          * -contact's personal ringing tone
@@ -477,69 +305,17 @@
          * @return leaves on error.
          */
         void GetMaxToneFileSizeL( TInt& aSizeLimitKB ) const;
-        
-        /**
-        * Returns currently active audio player.
-        * @return Currently active audio player or NULL if none active.
-        */
-        CPhoneAudioPlayer* ActiveAudioPlayer();
-        
-        /**
-        * Mutes the ringing tone.
-        */
-        void DoMuteRingingTone();
-        
 
     private:    // Data
-        
-        // Audio ring tone player. Memory allocated during construction.
-        // After constructed, no leave may be caused during audio playing
-        CPhoneAudioPlayer* iAudioPlayer;
-
-        // Audio player for beep once.
-        CPhoneAudioPlayer* iBeepOncePlayer;
-
-        // Audio player for silent tone.
-        CPhoneAudioPlayer* iSilentPlayer;
-        
-        // Audio player for unsecure VoIP tone.
-        CPhoneAudioPlayer* iUnsecureVoIPTonePlayer;
-        
-        // Default player.
-        CPhoneAudioPlayer* iDefaultPlayer;
-        
-        // Tts player.
-        CPhoneAudioPlayer* iTtsPlayer;
-
-        // Backup ringing tone. Incase all default player failed.
-        CPhoneAudioPlayer* iBackupPlayer;
-        
-		// Default player
-        CPhoneRingingTone* iDefaultRingingTone;
-        
-        // Media server.
-        CMdaServer* iMdaServer;
 
         // Indicate which tone is playing or need to be played:
         // EIdle - idle,
-        // EAudioTonePlaying - audio playing,
-        // EBeepOnce - beep once playing,
-        // ESilentTonePlaying - silent tone playing,
-        // EUnsecureVoIPTonePlaying - unsecure tone playing (VoIP),
-        // EDefaultTonePlaying - default tone playing,
-        // EBackupTonePlaying - backup tone playing,
         // EVideoTonePlaying - playing video ringing tone
         // ESilentVideoTonePlaying  - silent playing video ringing tone
         // EPersonalVideoTonePlaying - personal playing video ringing tone
         enum TTonePlayingStatus
             {
             EIdle,
-            EAudioTonePlaying,
-            EBeepOnce,
-            ESilentTonePlaying,
-            EUnsecureVoIPTonePlaying,
-            EDefaultTonePlaying,
-            EBackupTonePlaying,
             EVideoTonePlaying,
             ESilentVideoTonePlaying,
             EPersonalVideoTonePlaying
@@ -547,28 +323,12 @@
 
         // Current playing status.
         TTonePlayingStatus iTonePlayingStatus;
-        
-        // True if Tts is currently playing. Is different from 
-        // iTonePlayingStatus, because TTS is played in
-        // parallel with the other tone types
-        TBool iTtsTonePlaying;
-        
-        // Index of the TTS delay that is "executed" currently or is to be 
-        // "executed" after the current playing of the TTS tone. Is zero based
-        TInt iTtsDelayIndex;
-        
-        // True if TTS tone should be played when the next playing of the 
-        // default or personal tone is fired.
-        TBool iTtsToneToBePlayed;
 
         // Audio/Video tone, not owned
         CPhoneRingingTone* iAudioVideoRingingTone;
 
         // Volume for backup tone playing.
         TInt iVolume;
-        
-        // Volume of the text pronounced by the TTS engine
-        TInt iTtsVolume;
 
         // Ringing type for backup tone playing.
         TProfileRingingType iRingingType;
@@ -576,40 +336,26 @@
         // Timer.
         CPhoneTimer* iTimer;
 
-        // Timer, that tracks delays before playing TTS
-        CPhoneTimer* iTtsDelayTimer;
-
-        // Number of times TTS tone should be played for the CURRENT ringtone
-        // If ringing tone is to be played just once, iTtsDelayCount == 1,
-        // otherwise iTtsDelayCount == KTtsDelayCount
-        TInt iTtsDelaysCount;
-
-        // Player to be deleted asynchronously.
-        RPointerArray<CPhoneAudioPlayer> iAsyncDeletePlayers;
-
         // DRM extend security
         TBool iExtSecNeeded;
- 
+
         // Video ringing tone player
         MPhoneVideoPlayer* iVideoPlayer;
-    
+
         // State of this active object
         TState iState;
-              
-        // RingingType for TtsPlayer only.
-        TProfileRingingType iTtsRingingType;
-        
-        // Counter for TTs timeouts
-        TInt iTTsTimeOutCounter;
-        
+
         // Voice call ringing tone file size max value.
-        TInt iToneFileSizeLimitKB;             
+        TInt iToneFileSizeLimitKB;
 
         // Flag. Indicates video scaling capability of the device.
         TBool iArbitraryVideoScaling;
 
+        // Ringing tone server.
+        RPhoneRingingTonePlayer iToneServer;
+
     };
 
 #endif      // CPHONERINGINGTONEPLAYERAO_H
-            
+
 // End of File
--- a/phoneapp/phoneuiview/inc/cphoneviewcontroller.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/inc/cphoneviewcontroller.h	Mon Mar 15 12:40:24 2010 +0200
@@ -42,7 +42,6 @@
 class CPhoneDialerView;
 class TPhoneViewId;
 class TPhoneCommandParam;
-class TPhoneCmdParamBoolean;
 class CEikButtonGroupContainer;
 class CPhoneMenuController;
 class CPhoneNoteController;
@@ -614,16 +613,6 @@
         TInt SingleItemFetchType() const;
 
         /**
-         * Checks screen lock status.        
-         */        
-        TBool IsKeyLockEnabled();
-        
-        /**
-         * Unlock keys & screen.        
-         */         
-        void DisableKeyLock();
-        
-        /**
          * Checks if DTMF dialer mode is currently active        
          */
         TBool IsDtmfDialerActive() const;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiview/inc/mphoneringingtonesrv.h	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,122 @@
+/*
+* Copyright (c) 2002-2005 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:  Interface class for phone ringing tone server.
+*
+*/
+
+
+#ifndef __MPHONERINGINGTONESRV_H
+#define __MPHONERINGINGTONESRV_H
+
+// CLASS DECLARATION
+class MPhoneRingingToneServer
+    {
+public:
+    /**
+    * Increments sessions.
+    */
+    virtual void IncrementSessions() = 0;
+
+    /**
+    * Decrements sessions.
+    */
+    virtual void DecrementSessions() = 0;
+
+    // Ringing tone settings
+    
+    /**
+    * Sets extended security required flag.
+    * @param aNeeded Extended security required.
+    */
+    virtual void SetExtendedSecurityNeeded( TBool aNeeded ) = 0;
+    
+    /**
+    * Sets extended security required flag.
+    * @param aLimit Extended security required.
+    */
+    virtual void SetToneFileSizeLimit( TInt aLimit ) = 0;
+    
+    /**
+    * Sets ringing tone.
+    */
+    virtual void SetRingingToneL( const RMessage2& aMessage ) = 0;
+    
+    /**
+    * Sets default ringing tone.
+    * @param aMessage Message from Client.
+    */
+    virtual void SetDefaultRingingToneL( const RMessage2& aMessage ) = 0;
+
+    // Playback control
+    
+    /**
+    * Play audio ring tone. 
+    * @return True if the client message should not be completed.
+    * @param aMessage Message from Client.
+    */
+    virtual TBool PlayAudioRingTone( const RMessage2& aMessage ) = 0;
+
+    /**
+    * Play TTS tone simultaneously with Personal or Default tones.
+    * This method does not command phone to play TTS immediately. Instead 
+    * it registers a request to play TTS, when Personal or default tones 
+    * are played.
+    * @param aMessage Message from Client.
+    */
+    virtual void PlayTtsTone( const RMessage2& aMessage ) = 0;
+
+    /**
+    * Play default tone.
+    * @param aMessage Message from Client.
+    */
+    virtual void PlayDefaultTone( const RMessage2& aMessage ) = 0;
+
+    /**
+    * Play backup tone.
+    * @param aMessage Message from Client.
+    */
+    virtual void PlayBackupTone( const RMessage2& aMessage ) = 0;
+
+    /**
+    * Play silent tone. No_sound.wav will be played. If vibration alert
+    * is ON, it will vibrate.
+    */
+    virtual void PlaySilentTone() = 0;
+
+    /**
+    * Playing the Beep once.
+    * @param aMessage Message from Client.
+    */
+    virtual void BeepOnce( const RMessage2& aMessage ) = 0;
+
+    /**
+    * Play unsecure VoIP tone.
+    * Play tone if secure call fails and call is changed to unsecure call.
+    */
+    virtual void PlayUnsecureVoIPTone() = 0;
+
+    /**
+    * Mutes ringing tone.
+    */
+    virtual void MuteRingingTone() = 0;
+
+    /**
+    * Stops playing the ringing tone.
+    * Method does not do anything if ringing tone is not playing.
+    */
+    virtual void StopPlaying() = 0;
+
+    };
+
+#endif // __MPHONERINGINGTONESRV_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiview/inc/phoneringingtoneclient.h	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,146 @@
+/*
+* Copyright (c) 2002-2005 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:  Client interface for phone ringing tone server.
+*
+*/
+
+
+#ifndef RPHONERINGINGTONEPLAYER_H
+#define RPHONERINGINGTONEPLAYER_H
+
+// INCLUDES
+#include <Profile.hrh>
+
+// FORWARD DECLARATIONS
+class TPhoneCommandParam;
+
+// CLASS DECLARATION
+
+class RPhoneRingingTonePlayer : public RSessionBase
+    {
+public:
+    /**
+    * C++ default constructor.
+    */
+    RPhoneRingingTonePlayer();
+    
+    /**
+    * Destructor.
+    */
+    ~RPhoneRingingTonePlayer();
+
+    // Tone settings
+    
+    /**
+    * Sets extended security required flag.
+    * @param aNeeded Extended security required.
+    */
+    void SetExtendedSecurityNeeded( TBool aNeeded );
+    
+    /**
+    * Sets extended security required flag.
+    * @param aLimit Extended security required.
+    */
+    void SetToneFileSizeLimit( TInt aLimit );
+    
+    /**
+    * Sets ringing tone.
+    * @param aFilename Ringing tone.
+    */
+    void SetRingingToneL( const TDesC& aFilename );
+    
+    /**
+    * Sets default ringing tone.
+    * @param aFilename Ringing tone.
+    */
+    void SetDefaultRingingToneL( const TDesC& aFilename );
+
+    // Playback control
+    
+    /**
+    * Play audio ring tone 
+    * @param aVolume Volume used to play the ringing tone.
+    * @param aRingingType Ringing type.
+    */
+    void PlayAudioRingTone( TInt aVolume, TProfileRingingType aRingingType );
+
+    /**
+    * Play TTS tone simultaneously with Personal or Default tones.
+    * This method does not command phone to play TTS immediately. Instead 
+    * it registers a request to play TTS, when Personal or default tones 
+    * are played.
+    * @param aTextToSay Text, that should be pronounced by the Text-To-Speech 
+    * engine. This is normal descriptor, no UTF-8 and no "(tts)" prefix
+    * @param aVolume Volume for the TTS-tone, Does not effect the volume 
+    * of the normal tone, that will be played simulteneously with the TTS
+    * @param aRingingType ringing type.
+    */
+    void PlayTtsTone( const TDesC& aTextToSay, TInt aVolume, TProfileRingingType aRingingType );
+
+    /**
+    * Play default tone.
+    * @param aVolume volume used for the playing.
+    * @param aRingingType ringing type.
+    */
+    void PlayDefaultTone( TInt aVolume, TProfileRingingType aRingingType );
+
+    /**
+    * Play backup tone.
+    * @param aVolume volume used for the playing.
+    * @param aRingingType ringing type.
+    */
+    void PlayBackupTone( TInt aVolume, TProfileRingingType aRingingType );
+
+    /**
+    * Play silent tone. No_sound.wav will be played. If vibration alert
+    * is ON, it will vibrate.
+    */
+    void PlaySilentTone();
+
+    /**
+    * Playing the Beep once.
+    * @param aVolume volume used to play the ringing tone.
+    */
+    void BeepOnce( TInt aVolume );
+
+    /**
+    * Play unsecure VoIP tone.
+    * Play tone if secure call fails and call is changed to unsecure call
+    */
+    void PlayUnsecureVoIPTone();
+
+    /**
+    * Continues video playback with muted audio.
+    * Ringing tone is stopped.
+    */
+    void MuteRingingTone();
+
+    /**
+    * Stops playing the ringing tone.
+    * Method does not do anything if ringing tone is not playing.
+    */
+    void StopPlaying();
+
+
+public:
+    /**
+    * Establishes a connection with Server.
+    * @return Result code indicating the success of operation.
+    */
+    TInt Connect();
+    };
+
+#endif // CPHONERINGINGTONEPLAYERAO_H
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiview/inc/phoneringingtonesrv.h	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,190 @@
+/*
+* Copyright (c) 2002-2005 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:  Phone ringing tone server definitions.
+*
+*/
+
+
+#ifndef __PHONERINGINGTONESRV_H
+#define __PHONERINGINGTONESRV_H
+
+// INCLUDES
+#include <f32file.h>
+#include <Profile.hrh>
+#include "mphoneringingtonesrv.h"
+
+// CONSTANTS
+_LIT( KRingingToneServerName, "PhoneRingingToneSrv" );
+const TInt KRingingToneSrvVersionMajor = 1;
+const TInt KRingingToneSrvVersionMinor = 0;
+const TInt KRingingToneSrvVersionBuild = 0;
+
+// FORWARD DECLARATIONS
+class CPhoneRingingToneSrvPlayerAO;
+
+// CLASS DECLARATION
+class CPhoneRingingToneServer : public CServer2, 
+                                public MPhoneRingingToneServer
+    {
+public:
+    
+    /**
+    * Two-phased constructor.
+    * @return new instance.
+    */
+    static CPhoneRingingToneServer* NewLC();
+
+    /**
+    * Destructor.
+    */
+    ~CPhoneRingingToneServer();
+
+    /**
+    * Increments sessions.
+    */
+    void IncrementSessions();
+
+    /**
+    * Decrements sessions.
+    */
+    void DecrementSessions();
+
+    /**
+    * Thread entry function.
+    */
+    static TInt ThreadEntryFunc( TAny* aPtr );
+
+    /**
+    * From CServer, create a new session.
+    * @param aVersion It is the version of the client api.
+    * @param aMessage Connect message from Client.
+    * @return Returns a new session.
+    */          
+    CSession2* NewSessionL( const TVersion& aVersion,  const RMessage2& aMessage ) const;
+
+private:
+    /**
+    * C++ default constructor.
+    */
+    CPhoneRingingToneServer();
+
+    /**
+    * Symbian 2nd phase constructor.
+    */
+    void ConstructL();
+
+public:
+    // Ringing tone settings
+    
+    /**
+    * Sets extended security required flag.
+    * @param aNeeded Extended security required.
+    */
+    void SetExtendedSecurityNeeded( TBool aNeeded );
+    
+    /**
+    * Sets extended security required flag.
+    * @param aLimit Extended security required.
+    */
+    void SetToneFileSizeLimit( TInt aLimit );
+    
+    /**
+    * Sets ringing tone.
+    */
+    void SetRingingToneL( const RMessage2& aMessage );
+    
+    /**
+    * Sets default ringing tone.
+    * @param aMessage Message from Client.
+    */
+    void SetDefaultRingingToneL( const RMessage2& aMessage );
+
+    // Playback control
+    
+    /**
+    * Play audio ring tone. 
+    * @return True if the client message should not be completed.
+    * @param aMessage Message from Client.
+    */
+    TBool PlayAudioRingTone( const RMessage2& aMessage );
+
+    /**
+    * Play TTS tone simultaneously with Personal or Default tones.
+    * This method does not command phone to play TTS immediately. Instead 
+    * it registers a request to play TTS, when Personal or default tones 
+    * are played.
+    * @param aMessage Message from Client.
+    */
+    void PlayTtsTone( const RMessage2& aMessage );
+
+    /**
+    * Play default tone.
+    * @param aMessage Message from Client.
+    */
+    void PlayDefaultTone( const RMessage2& aMessage );
+
+    /**
+    * Play backup tone.
+    * @param aMessage Message from Client.
+    */
+    void PlayBackupTone( const RMessage2& aMessage );
+
+    /**
+    * Play silent tone. No_sound.wav will be played. If vibration alert
+    * is ON, it will vibrate.
+    */
+    void PlaySilentTone();
+
+    /**
+    * Playing the Beep once.
+    * @param aMessage Message from Client.
+    */
+    void BeepOnce( const RMessage2& aMessage );
+
+    /**
+    * Play unsecure VoIP tone.
+    * Play tone if secure call fails and call is changed to unsecure call.
+    */
+    void PlayUnsecureVoIPTone();
+
+    /**
+    * Mutes ringing tone.
+    */
+    void MuteRingingTone();
+
+    /**
+    * Stops playing the ringing tone.
+    * Method does not do anything if ringing tone is not playing.
+    */
+    void StopPlaying();
+
+private:
+
+    /**
+    * Runs server.
+    */
+    static void RunServerL();
+
+private:
+    // File server connection
+    RFs iFs;
+
+    // Number of active sessions
+    TInt iSessionCount;
+
+    // Player active object
+    CPhoneRingingToneSrvPlayerAO* iPlayer;
+    };
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiview/inc/phoneringingtonesrv.hrh	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) 2002-2005 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:  Phone ringing tone server enumerations.
+*
+*/
+
+
+#ifndef __PHONERINGINGTONESRV_HRH
+#define __PHONERINGINGTONESRV_HRH
+
+// ENUMERATIONS
+enum TRingingToneSrvOpcodes
+    {
+    ESetExtendedSecurityNeeded,
+    ESetToneFileSizeLimit,
+    ESetAudioRingingTone,
+    ESetDefaultRingingTone,
+
+    EPlayAudioRingTone,
+    EPlayTtsTone,
+    EPlayDefaultTone,
+    EPlayBackupTone,
+    EPlaySilentTone,
+    EBeepOnce,
+    EPlayUnsecureVoIPTone,
+
+    EMuteRingingTone,
+    EStopPlaying
+    };
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiview/inc/phoneringingtonesrvplayerao.h	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,514 @@
+/*
+* Copyright (c) 2002-2005 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:  Active object which implements ringing tone functionality
+*
+*/
+
+
+#ifndef __PHONERINGINGTONESRVPLAYERAO_H
+#define __PHONERINGINGTONESRVPLAYERAO_H
+
+// INCLUDES
+#include <e32base.h>
+#include <Profile.hrh>
+
+#include "MPhoneAudioPlayerObserver.h"
+#include "MPhoneTimer.h"
+#include "CPhoneAudioPlayer.h"
+
+// FORWARD DECLARATIONS
+class RFs;
+class CPhoneTimer;
+class CMdaServer;
+class CPhoneRingingTone;
+
+// CLASS DECLARATION
+class CPhoneRingingToneSrvPlayerAO : 
+    public CActive,
+    private MPhoneAudioPlayerObserver,
+    private MPhoneTimer
+    {
+    public:
+        // States for this active object
+        enum TState
+            {
+            EIdleState,
+            EDeletingAudioPlayer
+            };
+
+    public:
+
+        /**
+        * Two-phased constructor.
+        * @return new instance.
+        */
+        static CPhoneRingingToneSrvPlayerAO* NewL( RFs &aFs );
+
+        /**
+        * Destructor.
+        */
+        ~CPhoneRingingToneSrvPlayerAO();
+
+        /**
+        * Play audio ring tone. 
+        * @param aVolume Volume used to play the ringing tone.
+        * @param aRingingType Ringing type.
+        * @param aMessage Message from Client.
+        * @return ETrue if the client message should not be completed.
+        */
+        TBool PlayAudioRingTone( 
+            TInt aVolume, 
+            TProfileRingingType aRingingType,
+            const RMessage2& aMessage );
+
+        /**
+        * Play default tone.
+        * @param aVolume volume used for the playing.
+        * @param aRingingType ringing type.
+        */
+        void PlayDefaultTone( 
+            TInt aVolume, 
+            TProfileRingingType aRingingType );
+
+        /**
+        * Play backup tone.
+        * @param aVolume volume used for the playing.
+        * @param aRingingType ringing type.
+        */
+        void PlayBackupTone( 
+            TInt aVolume, 
+            TProfileRingingType aRingingType );
+
+        /**
+        * Playing the Beep once.
+        * @param aVolume volume used to play the ringing tone.
+        */
+        void BeepOnce( TInt aVolume );
+
+        /**
+        * Play silent tone. No_sound.wav will be played. If vibration alert
+        * is ON, it will vibrate.
+        */
+        void PlaySilentTone();
+
+        /**
+        * Play unsecure VoIP tone.
+        * Play tone if secure call fails and call is changed to unsecure call.
+        */
+        void PlayUnsecureVoIPTone();
+
+        /**
+        * Stops playing the ringing tone.
+        * Method does not do anything if ringing tone is not playing.
+        */
+        void StopPlaying();
+
+        /**
+        * Mutes ringing tone.
+        */
+        void MuteRingingTone();
+
+        /**
+        * Play TTS tone simultaneously with Personal or Default tones.
+        * This method does not command phone to play TTS immediately. Instead 
+        * it registers a request to play TTS, when Personal or default tones 
+        * are played.
+        *
+        * @since Series 60 3.0
+        * @param aTextToSay Text, that should be pronounced by the 
+        * Text-To-Speech engine. This is normal descriptor, no UTF-8 
+        * and no "(tts)" prefix
+        * @param aVolume Volume for the TTS-tone, Does not effect the volume 
+        * of the normal tone, that will be played simulteneously with the TTS
+        * @param aRingingType ringing type.
+        */
+        void PlayTtsTone(
+            const TDesC& aTextToSay,
+            TInt aVolume,
+            TProfileRingingType aRingingType );
+
+        /**
+        * Checks if extended security required.
+        * @since Series 60 3.1
+        * @return ETrue if extended security is required.
+        */
+        TBool ExtendedSecurity() const;
+
+    public:
+        /**
+        * Sets extended security required flag.
+        * @param aNeeded Extended security required.
+        */
+        void SetExtendedSecurityNeeded( TBool aNeeded );
+    
+        /**
+        * Sets extended security required flag.
+        * @param aLimit Extended security required.
+        */
+        void SetToneFileSizeLimit( TInt aLimit );
+    
+        /**
+        * Sets default ringing tone.
+        * @param aFilename Ringing tone.
+        */
+        void SetDefaultRingingToneL( const TDesC& aFilename );
+    
+        /**
+        * Sets ringing tone.
+        * @param aFilename Ringing tone.
+        */
+        void SetRingingToneL( const TDesC& aFilename );
+
+    private:
+
+        /**
+        * Handle the error of audio file player.
+        * @param aEvent The error event happend in initializing or playing.
+        * @param aError The error code return by audio server. Observer can 
+        *               handle  these two error code for recoverable 
+        *               and unrecoverable errors.
+        * @param aId Indicate which audio player is out of working.
+        */
+        virtual void HandleAudioPlayerError( 
+            TPhoneAudioPlayerErrorEvent aEvent, 
+            TInt aError, 
+            TInt aId = KPhoneAudioPlayerNotSpecified );
+
+        /**
+        * Handle audio player initialize complete.
+        * @param aId Indicate which audio player is out of working.
+        */
+        virtual void HandleAudioPlayerInitComplete(
+            TInt aId = KPhoneAudioPlayerNotSpecified );
+
+        /**
+        * Handle audio file playing complete successfully.
+        * @param aId Indicate which audio player is out of working.
+        */
+        virtual void HandlePlayingComplete( 
+            TInt aId = KPhoneAudioPlayerNotSpecified );
+
+        /**
+        * @see MPhoneTimer
+        */
+        virtual void HandleTimeOutL();
+
+        /** 
+        * Enumerates identifiers for each player:
+        * EPlayerAudio - audio
+        * EPlayerBeepOnce - beep once
+        * EPlayerSilent - silent
+        * EPlayerUnsecureVoIP - unsecure VoIP
+        * EPlayerDefault - default
+        * EPlayerBackup - backup
+        *
+        * EPlayerFirst and EPlayerLast are alias
+        * to other identifiers.
+        * EPlayerFirst - first player
+        * EPlayerLast - last player
+        */
+        enum TPlayerId
+            {
+            EPlayerFirst,
+            EPlayerAudio = EPlayerFirst,
+            EPlayerBeepOnce,
+            EPlayerSilent,
+            EPlayerUnsecureVoIP,
+            EPlayerDefault,
+            EPlayerBackup,
+            EPlayerTts, 
+            EPlayerLast = EPlayerTts,
+            EPlayerCount
+            };
+
+        /**
+        * Enumerates how many times TTs is played
+        * ESaidOnce -once
+        * ESaidTwice twice 
+        */
+        enum TTtsStatus
+            {
+            ESaidOnce,
+            ESaidTwice
+            };
+
+        /**
+        * C++ default constructor.
+        */
+        CPhoneRingingToneSrvPlayerAO( RFs& aFs );
+
+        /**
+        * Symbian 2nd phase constructor.
+        */
+        void ConstructL();
+
+        /**
+        * Do construct tone.
+        * @param aRingingTone Ringing tone.
+        * @param aId Indicates the audio player.
+        * @return The instance of the player. NULL is returned if it's failed.
+        */
+        CPhoneAudioPlayer* ConstructTonePlayer( 
+            const CPhoneRingingTone& aRingingTone,
+            TInt aId );
+
+        /**
+        * Handle audio player error.
+        * @param aDelete ETrue if deletion of the player allowed, 
+        *                EFalse otherwise.
+        * @param aSync ETrue if synchronous deletion of players is allowed,
+        *              EFalse otherwise.
+        */
+        void DoHandlePlayerError(
+            TBool aDelete,
+            TBool aSync );
+
+        /**
+        * Convert ringing type from PhoneAppEnging to the ringing type in 
+        * CPhoneAudioPlayer.
+        * @param aRingingType the ringing type form PhoneAppEngine.
+        * @return ringing type of CPhoneAudioPlayer.
+        */
+        CPhoneAudioPlayer::TRingingType ConvertRingingType(
+            TProfileRingingType aRingingType );
+
+        /**
+        * Construct media server and backup tone player.
+        */
+        TInt ConstructPlayers();
+
+        /**
+        * Construct media server and backup tone player.
+        */
+        void ConstructPlayersL();
+
+        /**
+        * Construct sequence players.
+        * @param aPlayer player to be constructed.
+        */
+        void ConstructSequencePlayer(
+            TPlayerId aPlayer );
+
+        /**
+        * Construct sequence players.
+        * @param aPlayer player to be constructed.
+        */
+        void ConstructSequencePlayerL(
+            TPlayerId aPlayer );
+
+        /**
+        * Cleanup players.
+        */
+        void CleanupPlayers();
+
+        /**
+        * Deletes player asynchronoysly.
+        * @param aPlayer player to be deleted.
+        */
+        void DeletePlayerAsync(
+            TPlayerId aPlayer );
+
+        /**
+        * @see CActive::RunL.
+        */
+        void RunL();
+
+        /**
+        * @see CActive::DoCancel.
+        */
+        void DoCancel();
+
+        /**
+        * Wrapper of DoHandleTtsDelayTimeout, that can be used as TCallback. 
+        * Immediately passes control to DoHandleTtsDelayTimeout method.
+        * @since Series 60 3.0
+        * @param aObject Object to call DoHandleTtsDelayTimeout() on, 
+        *        instance of CPhoneRingingTonePlayer.
+        * @return KErrNone.
+        */
+        static TInt HandleTtsDelayTimeout( TAny* aObject );
+
+        /**
+        * It is called after TTS delay elapsed. Starts playing TTS.
+        */
+        void DoHandleTtsDelayTimeout();
+
+        /**
+        * Checks if TTS component should be played for the current ringtone 
+        * playback and initializes the TTS playback. This method is to be 
+        * called from within PlayXXXXTone methods
+        * @since Series 60 3.0
+        * @param aRingingType ringing type
+        */
+        void AddTtsPlaybackIfNeeded( TProfileRingingType aRingingType );
+
+        /**
+        * Returns currently active player which is used wit TTS player.
+        * @return pointer to CPhoneAudioPlayer.
+        */
+        CPhoneAudioPlayer* GetCurrentlyActiveAudioPlayerWithTTs(); 
+
+        /**
+        * TTs cases only. Calculates new volume and ramptimes
+        * for Ascending TTS ringing case and normal TTS ringing case.
+        * @param aStatus -status of TTs player.
+        */ 
+        void SolveNewVolumeAndRamptime( TTtsStatus aStatus ); 
+
+        /**
+        * Retarts currently active ringingtone player.
+        */
+        void ReStartRingingTonePlayer();
+
+         /**
+         * Checks if ringing tone file's size is larger than the size limit.
+         * If size limit is exceeded, default tone is played instead.
+         * @since 3.1
+         * @param aRingingTone  Tone to check.
+         * @return EFalse if the limit was exceeded and thus default tone played.
+         *         ETrue  if tone file's size was valid and the checked tone 
+         *                can be played.
+         */
+        TBool CheckAndHandleToneSizeLimit( CPhoneRingingTone* aRingingTone );
+
+         /**
+         * Checks if ringing tone file's size is larger than the size limit.
+         * @since 3.1
+         * @param aFile   File to check.
+         *        aSizeLimitKB  the size limit in kB is set to this variable.
+         * @return KErrNone        if the file can be used as a ringing tone.
+         *         KErrTooBig        if the file size limit is exceeded.
+         *         Other error value if error happened during size checking.
+         */
+        TInt CheckToneFileSize( const TDesC& aFile, TInt aSizeLimitKB );
+
+        /**
+        * Returns currently active audio player.
+        * @return Currently active audio player or NULL if none active.
+        */
+        CPhoneAudioPlayer* ActiveAudioPlayer();
+
+    private:    // Data
+        // Handle to file server
+        RFs &iFs;
+
+        // Audio ring tone player. Memory allocated during construction.
+        // After constructed, no leave may be caused during audio playing
+        CPhoneAudioPlayer* iAudioPlayer;
+
+        // Audio player for beep once.
+        CPhoneAudioPlayer* iBeepOncePlayer;
+
+        // Audio player for silent tone.
+        CPhoneAudioPlayer* iSilentPlayer;
+
+        // Audio player for unsecure VoIP tone.
+        CPhoneAudioPlayer* iUnsecureVoIPTonePlayer;
+
+        // Default player.
+        CPhoneAudioPlayer* iDefaultPlayer;
+
+        // Tts player.
+        CPhoneAudioPlayer* iTtsPlayer;
+
+        // Backup ringing tone. Incase all default player failed.
+        CPhoneAudioPlayer* iBackupPlayer;
+
+        // Default ringing tone
+        CPhoneRingingTone* iDefaultRingingTone;
+
+        // Media server.
+        CMdaServer* iMdaServer;
+
+        // Indicate which tone is playing or need to be played:
+        // EIdle - idle,
+        // EAudioTonePlaying - audio playing,
+        // EBeepOnce - beep once playing,
+        // ESilentTonePlaying - silent tone playing,
+        // EDefaultTonePlaying - default tone playing,
+        // EBackupTonePlaying - backup tone playing,
+        enum TTonePlayingStatus
+            {
+            EIdle,
+            EAudioTonePlaying,
+            EBeepOnce,
+            ESilentTonePlaying,
+            EUnsecureVoIPTonePlaying,
+            EDefaultTonePlaying,
+            EBackupTonePlaying
+            };
+
+        // Current playing status.
+        TTonePlayingStatus iTonePlayingStatus;
+
+        // True if Tts is currently playing. Is different from 
+        // iTonePlayingStatus, because TTS is played in
+        // parallel with the other tone types
+        TBool iTtsTonePlaying;
+
+        // Index of the TTS delay that is "executed" currently or is to be 
+        // "executed" after the current playing of the TTS tone. Is zero based
+        TInt iTtsDelayIndex;
+
+        // True if TTS tone should be played when the next playing of the 
+        // default or personal tone is fired.
+        TBool iTtsToneToBePlayed;
+
+        // Normal ringing tone
+        CPhoneRingingTone* iAudioVideoRingingTone;
+
+        // Volume for backup tone playing.
+        TInt iVolume;
+
+        // Volume of the text pronounced by the TTS engine
+        TInt iTtsVolume;
+
+        // Ringing type for backup tone playing.
+        TProfileRingingType iRingingType;
+
+        // Timer.
+        CPhoneTimer* iTimer;
+
+        // Timer, that tracks delays before playing TTS
+        CPhoneTimer* iTtsDelayTimer;
+
+        // Number of times TTS tone should be played for the CURRENT ringtone
+        // If ringing tone is to be played just once, iTtsDelayCount == 1,
+        // otherwise iTtsDelayCount == KTtsDelayCount
+        TInt iTtsDelaysCount;
+
+        // Player to be deleted asynchronously.
+        RPointerArray<CPhoneAudioPlayer> iAsyncDeletePlayers;
+
+        // DRM extend security
+        TBool iExtSecNeeded;
+
+        // State of this active object
+        TState iState;
+
+        // RingingType for TtsPlayer only.
+        TProfileRingingType iTtsRingingType;
+
+        // Counter for TTs timeouts
+        TInt iTTsTimeOutCounter;
+
+        // Voice call ringing tone file size max value.
+        TInt iToneFileSizeLimitKB; 
+
+        // Client message.
+        RMessage2 iClientMessage;
+
+    };
+
+#endif //__PHONERINGINGTONESRVPLAYERAO_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiview/inc/phoneringingtonesrvsession.h	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,63 @@
+/*
+* Copyright (c) 2002-2005 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:  Session class for phone ringingtone server.
+*
+*/
+
+
+#ifndef __PHONERINGINGTONESRVSESSION_H
+#define __PHONERINGINGTONESRVSESSION_H
+
+// FORWARD DECLARATIONS
+class MPhoneRingingToneServer;
+
+// CLASS DECLARATION
+class CPhoneRingingToneServerSession : public CSession2
+    {
+public:
+    /**
+    * Two-phased constructor.
+    * @param aServer It is the main server object.
+    * @return new instance.
+    */
+    static CPhoneRingingToneServerSession* NewL( MPhoneRingingToneServer& aServer );
+
+    /**
+    * Destructor.
+    */
+    ~CPhoneRingingToneServerSession();
+
+protected:
+    /**
+    * C++ default constructor.
+    */
+    CPhoneRingingToneServerSession( MPhoneRingingToneServer& aServer );
+    
+    /**
+    * Symbian 2nd phase constructor.
+    */
+    void ConstructL();
+
+    /**
+    * From CSession2, it is called whenever request is processed.
+    * @param aMessage It is the request.
+    */
+    void ServiceL( const RMessage2& aMessage );
+
+private:
+    // Server.
+    MPhoneRingingToneServer& iServer;
+    };
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiview/inc/phoneuiviewtrace.h	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,69 @@
+/*
+* ============================================================================
+*  Name        : phoneuiviewtrace.h
+*  Part of     : PhoneUI / PhoneUIView
+*  Description : Macros for tracing.
+*  Version     : 
+*
+*  Copyright © 2010 Nokia.  All rights reserved.
+*  This material, including documentation and any related computer
+*  programs, is protected by copyright controlled by Nokia.  All
+*  rights are reserved.  Copying, including reproducing, storing,
+*  adapting or translating, any or all of this material requires the
+*  prior written consent of Nokia.  This material also contains
+*  confidential information which may not be disclosed to others
+*  without the prior written consent of Nokia.
+* ============================================================================
+* Template version: 4.1
+*/
+
+
+#ifndef PHONEUIVIEWTRACE_H
+#define PHONEUIVIEWTRACE_H
+
+//#define __RINGINGTONE_LOGGING
+#ifdef __RINGINGTONE_LOGGING
+
+// INCLUDES
+#include <e32svr.h>
+
+// CONSTANTS
+
+const TInt KPhoneUiViewDebugBufferSize = 100;
+
+// MACROS
+
+typedef TBuf<KPhoneUiViewDebugBufferSize> TPhoneUiViewDebBuf;
+
+#define PHONEUIVIEW_PRINT(x) { _LIT( KPhoneUiViewDebugPrintPrefix, "PhoneUiView: ");\
+    TPhoneUiViewDebBuf buf( KPhoneUiViewDebugPrintPrefix);\
+    if ((_L(x).Length()) + buf.Length() <= KPhoneUiViewDebugBufferSize )\
+        buf.Append(_L(x)); RDebug::Print(buf); }
+
+#define PHONEUIVIEW_PRINTF(x,y) { _LIT( KPhoneUiViewDebugPrintPrefix, "PhoneUiView: ");\
+    TPhoneUiViewDebBuf buf( KPhoneUiViewDebugPrintPrefix);\
+    if ((_L(x).Length()) + buf.Length() <= KPhoneUiViewDebugBufferSize )\
+        buf.Append(_L(x)); RDebug::Print(buf,y);}
+
+#define PHONEUIVIEW_PRINTF2(x,y,z) { _LIT( KPhoneUiViewDebugPrintPrefix, "PhoneUiView: ");\
+    TPhoneUiViewDebBuf buf( KPhoneUiViewDebugPrintPrefix);\
+    if ((_L(x).Length()) + buf.Length() <= KPhoneUiViewDebugBufferSize )\
+        buf.Append(_L(x)); RDebug::Print(buf,y,z); }
+
+#define PHONEUIVIEW_PRINTF3(v,x,y,z) { _LIT( KPhoneUiViewDebugPrintPrefix, "PhoneUiView: ");\
+    TPhoneUiViewDebBuf buf( KPhoneUiViewDebugPrintPrefix);\
+    if ((_L(v).Length()) + buf.Length() <= KPhoneUiViewDebugBufferSize )\
+        buf.Append(_L(v)); RDebug::Print(buf,x,y,z); }
+
+#else // !_DEBUG
+
+#define PHONEUIVIEW_PRINT(x)
+#define PHONEUIVIEW_PRINTF(x,y)
+#define PHONEUIVIEW_PRINTF2(x,y,z)
+#define PHONEUIVIEW_PRINTF3(v,x,y,z)
+
+#endif      // _DEBUG
+
+#endif      // PHONEUIVIEWTRACE_H
+
+// End of File
--- a/phoneapp/phoneuiview/inc/phoneviewcommanddefinitions.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/inc/phoneviewcommanddefinitions.h	Mon Mar 15 12:40:24 2010 +0200
@@ -141,7 +141,6 @@
     EPhoneViewGetSecurityModeStatus,
     EPhoneViewSetStatusPaneVisible, // 110
     EPhoneViewEnableKeyLock,
-    EPhoneViewEnableKeyLockWithoutNote,
     EPhoneViewLaunchFaxModem,
     EPhoneViewUpdateFSW,
     EPhoneViewIsQuery,
@@ -197,8 +196,6 @@
     EPhoneViewSetEikonNotifiersDisabled, 
     EPhoneViewCancelAllNotications, 
     EPhoneViewSetVideoCallDTMFVisibilityFlag,
-    EPhoneViewIsKeyLockEnabled,
-    EPhoneViewDisableKeyLock,
     EPhoneViewLoadPlugins, // 170
     EPhoneViewOpenVirtualKeyBoard,
     EPhoneViewUpdateNoteSoftkeys,
--- a/phoneapp/phoneuiview/src/cphoneaudioplayer.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/src/cphoneaudioplayer.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -30,7 +30,7 @@
 #include "cphoneringingtone.h"
 #include "mphoneaudioplayerobserver.h"
 #include "phoneconstants.h"
-#include "phonelogger.h"
+#include "phoneuiviewtrace.h"
 #include "phoneui.pan"
 
 
@@ -69,7 +69,7 @@
     const TDesC& aFileName,
     CMdaServer* aMdaServer )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::ConstructL()" );
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::ConstructL() <" );
     if ( iFormat == EFormatTone )
         {
         iTonePlayer = CMdaAudioToneUtility::NewL( *this, aMdaServer );
@@ -79,9 +79,7 @@
     else
         {
         //audio sample player
-        __PHONELOG3( 
-            EBasic, 
-            EPhoneUIView, 
+        PHONEUIVIEW_PRINTF3(
             "CPhoneAudioPlayer::ConstructL - aFileName(%S), iPriority(%d), iPreference(%d)",
             &aFileName, 
             iPriority, 
@@ -92,10 +90,11 @@
             *this, 
             iPriority,
             static_cast< TMdaPriorityPreference >( iPreference ),
-            aMdaServer );            
+            aMdaServer );
         iPlayerStatus = EToneLoading;
-        
+
         }
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::ConstructL() >" );
     }
 
 // -----------------------------------------------------------------------------
@@ -106,11 +105,12 @@
     const TDesC8& aSequence,
         CMdaServer* aMdaServer )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::ConstructSeqL()" );
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::ConstructSeqL() <" );
     iTonePlayer = CMdaAudioToneUtility::NewL( *this, aMdaServer );
     iSequence = aSequence.AllocL();
     iTonePlayer->PrepareToPlayDesSequence( *iSequence );
     iPlayerStatus = EToneLoading;
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::ConstructSeqL() >" );
     }
 
 // -----------------------------------------------------------------------------
@@ -122,19 +122,19 @@
     TInt aPriority,
     TUint aPreference )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::ConstructTtsL()" );
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::ConstructTtsL() <" );
     delete iTtsPlayer; // if any
     iTtsPlayer = NULL;
     iTtsPlayer = 
         CMdaAudioPlayerUtility::NewL( 
             *this, aPriority, 
             static_cast< TMdaPriorityPreference >( aPreference ) );
-    
+
     delete iTtsText;  // if any
     iTtsText = NULL;
     // UTF-8 strings can take up to 4 bytes per character
     iTtsText = HBufC8::NewL( aTtsText.Length() << KTimesToMultiply ); 
-    
+
     TPtr8 refText = iTtsText->Des(); 
     User::LeaveIfError( 
         CnvUtfConverter::ConvertFromUnicodeToUtf8( refText, aTtsText ) );
@@ -148,8 +148,9 @@
         // ReAlloc failed, set back to original.
         iTtsText = oldText;
         }
-    
+
     iTtsPlayer->OpenDesL( *iTtsText );
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::ConstructTtsL() >" );
     }
 
 // -----------------------------------------------------------------------------
@@ -165,7 +166,7 @@
     CMdaServer* aMdaServer,
     TBool aExtSecNeeded )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::New()" );
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::New() <" );
     CPhoneAudioPlayer* self = NULL;
     TRAPD( err, self = CPhoneAudioPlayer::NewL( 
         aRingingTone,
@@ -179,6 +180,7 @@
         {
         return NULL;
         }
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::New() >" );
     return self;
     }
 
@@ -195,23 +197,23 @@
     CMdaServer* aMdaServer,
     TBool aExtSecNeeded )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::NewL()" );
-    __PHONELOG1( EBasic, EPhoneUIView, "CPhoneAudioPlayer::NewL - aExtSecNeeded(%d)",
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::NewL() <" );
+    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::NewL - aExtSecNeeded(%d)",
         aExtSecNeeded );
-    
+
     // Check the file DRM property if extend secure is needed.
     if ( aExtSecNeeded )
         {
         if ( !aRingingTone.IsFileInRom() &&
              !aRingingTone.IsFileDrmProtected() )
             {
-            __PHONELOG( EBasic, EPhoneUIView, "CPhoneAudioPlayer::NewL - DRM extend security check permission denied" );
+            PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::NewL - DRM extend security check permission denied" );
             User::Leave( KErrPermissionDenied );
             }
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneAudioPlayer::NewL - DRM extend security check ok" );
+        PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::NewL - DRM extend security check ok" );
         }
-	// RNG file types have to be played with CMdaAudioToneUtility player.
-	// Otherwise use sample player
+    // RNG file types have to be played with CMdaAudioToneUtility player.
+    // Otherwise use sample player
     TAudioDataFormat format = 
     ( aRingingTone.MimeType().CompareF( KFileListRngMimeType ) == KErrNone ) 
     ? EFormatTone :EFormatSample;
@@ -223,11 +225,11 @@
             aPriority,
             aPreference,
             aId );
-    
+
     CleanupStack::PushL( self );
     self->ConstructL( aRingingTone.FileName(), aMdaServer );
     CleanupStack::Pop( self );
-
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::NewL() >" );
     return self;
     }
 
@@ -244,7 +246,7 @@
     CMdaServer* aMdaServer,
     TBool aExtSecNeeded )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::NewL()" );
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::NewL() <" );
     CPhoneRingingTone* tone = CPhoneRingingTone::NewL( aFileName );
     CleanupStack::PushL( tone );
 
@@ -257,8 +259,8 @@
                                                          aExtSecNeeded );
 
     CleanupStack::PopAndDestroy( tone );
-    
-    return player;        
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::NewL() >");
+    return player;
     }
 
 // -----------------------------------------------------------------------------
@@ -273,7 +275,7 @@
     TInt aId,
     CMdaServer* aMdaServer )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::NewSeqL()" );
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::NewSeqL() <" );
     CPhoneAudioPlayer* self = 
         new (ELeave) CPhoneAudioPlayer( 
             EFormatTone, 
@@ -281,11 +283,12 @@
             aPriority,
             aPreference,
             aId );
-    
+
     CleanupStack::PushL( self );
     self->ConstructSeqL( aSequence, aMdaServer  );
     CleanupStack::Pop( self );
 
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::NewSeqL() >" );
     return self;
     }
 
@@ -300,7 +303,7 @@
     MPhoneAudioPlayerObserver& aObserver, 
     TInt aId )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::NewTtsL()" );
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::NewTtsL() <" );
     CPhoneAudioPlayer* self = 
         new (ELeave) CPhoneAudioPlayer( 
             EFormatTts, 
@@ -308,11 +311,11 @@
             aPriority,
             aPreference,
             aId );
-    
+
     CleanupStack::PushL( self );
     self->ConstructTtsL( aText, aPriority, aPreference );
     CleanupStack::Pop( self );
-
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::NewTtsL() >" );
     return self;
     }
 
@@ -322,14 +325,14 @@
 //
 CPhoneAudioPlayer::~CPhoneAudioPlayer()
     {
-    
+
     if ( iAudioOutput )
         {
-    	delete iAudioOutput;    
-        }  
-    if ( iTonePlayer )  
+        delete iAudioOutput;
+        }
+    if ( iTonePlayer )
         {
-        delete iTonePlayer;  
+        delete iTonePlayer;
         } 
     if ( i3DPlugin )
        {
@@ -338,22 +341,22 @@
         }
     // ECom cleanup
     REComSession::FinalClose();
-    if ( iSamplePlayer )    
+    if ( iSamplePlayer )
         {
         delete iSamplePlayer; 
         }
     if ( iTtsPlayer )
         {
-        delete iTtsPlayer;   
+        delete iTtsPlayer; 
         }
     if ( iSequence )
         {
         delete iSequence; 
         }
-    if ( iTtsText )  
+    if ( iTtsText )
         {
         delete iTtsText;
-        }   
+        } 
     }
 
 // -----------------------------------------------------------------------------
@@ -362,16 +365,12 @@
 //
 void CPhoneAudioPlayer::Play( TRingingType aRingType, TInt aVolume, TInt aTTsToBePlayed )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::Play()" );
-    __PHONELOG2( 
-        EBasic, 
-        EPhoneUIView, 
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::Play() <" );
+    PHONEUIVIEW_PRINTF2( 
         "CPhoneAudioPlayer::Play - iFormat(%d), iPlayerStatus(%d)",
         iFormat, 
         iPlayerStatus );
-    __PHONELOG3( 
-        EBasic, 
-        EPhoneUIView, 
+    PHONEUIVIEW_PRINTF3( 
         "CPhoneAudioPlayer::Play - aRingType(%d), aVolume(%d), aTTsToBePlayed(%d)",
         aRingType, 
         aVolume,
@@ -379,7 +378,7 @@
     iRingType = aRingType;
     iVolume = aVolume;
     iTTsToBePlayed = aTTsToBePlayed;
-    
+
     if ( iFormat == EFormatTone )
         {
         switch ( iPlayerStatus )
@@ -400,8 +399,7 @@
 
             default:
                 __ASSERT_DEBUG( EFalse, 
-
-                      Panic( EPhoneViewCaseNotHandled ) );
+                       Panic( EPhoneViewCaseNotHandled ) );
             }
         }
     else if ( iFormat == EFormatTts )
@@ -450,27 +448,25 @@
 
             default:
                 __ASSERT_DEBUG( EFalse, 
-
                         Panic( EPhoneViewCaseNotHandled ) );
             }
         }
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::Play() >" );
     }
-    
+
 // -----------------------------------------------------------------------------
 // CPhoneAudioPlayer::ReStartPlaying
 // -----------------------------------------------------------------------------
-//    
+//
 void CPhoneAudioPlayer::ReStartPlaying()
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::ReStartPlaying()" );
-    __PHONELOG3( 
-        EBasic, 
-        EPhoneUIView, 
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::ReStartPlaying() <" );
+    PHONEUIVIEW_PRINTF3( 
         "CPhoneAudioPlayer::ReStartPlaying - iFormat(%d), iRingType(%d), iVolume(%d)",
         iFormat, 
         iRingType, 
         iVolume );
-        
+
     if ( iFormat == EFormatTone )
         {
         iTonePlayer->Play();
@@ -480,12 +476,13 @@
         {
         iTtsPlayer->Play();
         iPlayerStatus = ETonePlaying;
-        }        
+        }
     else
         {
         iSamplePlayer->Play();
         iPlayerStatus = ETonePlaying;
-        }    
+        }
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::ReStartPlaying() >" );
     }
 
 // -----------------------------------------------------------------------------
@@ -494,9 +491,10 @@
 //
 void CPhoneAudioPlayer::StopPlaying()
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::StopPlaying()" );
+   PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::StopPlaying() <" );
+
     iToBePlaying = EFalse;
-    
+
     if ( iFormat == EFormatTone )
         {
         if ( EMdaAudioToneUtilityPrepared == iTonePlayer->State() )
@@ -522,11 +520,12 @@
             }
         else
             {
-            iSamplePlayer->Stop();        
+            iSamplePlayer->Stop();
             }
         }
-    
+
     iPlayerStatus = EToneReady;
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::StopPlaying() >" );
     }
 
 // -----------------------------------------------------------------------------
@@ -537,8 +536,8 @@
     TInt aError, 
     const TTimeIntervalMicroSeconds& /*aDuration*/ )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::MapcInitComplete()" );
-    __PHONELOG1( EBasic, EPhoneUIView, "CPhoneAudioPlayer::MapcInitComplete - aError(%d)",
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::MapcInitComplete() <" );
+    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::MapcInitComplete - aError(%d)",
         aError );
     __ASSERT_DEBUG( ( ( iFormat == EFormatSample ) || ( iFormat == EFormatTts ) ) && 
         ( iPlayerStatus == EToneLoading ), Panic( EPhoneViewGeneralError ) );
@@ -562,6 +561,7 @@
             MPhoneAudioPlayerObserver::EAudioPlayerInitializingFailure, 
             aError, iId );
         }
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::MapcInitComplete() >" );
     }
 
 // -----------------------------------------------------------------------------
@@ -570,8 +570,8 @@
 //
 void CPhoneAudioPlayer::MapcPlayComplete( TInt aError )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::MapcPlayComplete()" );
-    __PHONELOG2( EBasic, EPhoneUIView, "CPhoneAudioPlayer::MapcPlayComplete - iFormat(%d), aError(%d)",
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::MapcPlayComplete() <" );
+    PHONEUIVIEW_PRINTF2( "CPhoneAudioPlayer::MapcPlayComplete - iFormat(%d), aError(%d)",
         iFormat, aError );
     iPlayerStatus = EToneReady;
 
@@ -582,7 +582,7 @@
         {
         i3DPlugin->Stop();
         delete i3DPlugin;
-        i3DPlugin = NULL;            
+        i3DPlugin = NULL;
         }
 
     if ( aError != KErrNone )
@@ -595,6 +595,7 @@
         {
         iObserver.HandlePlayingComplete( iId );
         }
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::MapcPlayComplete() >" );
     }
 
 // -----------------------------------------------------------------------------
@@ -603,11 +604,11 @@
 //
 void CPhoneAudioPlayer::MatoPrepareComplete( TInt aError )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::MatoPrepareComplete()" );
-    __PHONELOG1( EBasic, EPhoneUIView, "CPhoneAudioPlayer::MatoPrepareComplete - aError(%d)",
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::MatoPrepareComplete() <" );
+    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::MatoPrepareComplete - aError(%d)",
         aError );
-        
-	__ASSERT_DEBUG( ( iFormat == EFormatTone ) && ( iPlayerStatus == EToneLoading ), 
+
+    __ASSERT_DEBUG( ( iFormat == EFormatTone ) && ( iPlayerStatus == EToneLoading ), 
         Panic( EPhoneViewGeneralError ) );
     if ( aError == KErrNone )
         {
@@ -629,6 +630,7 @@
             MPhoneAudioPlayerObserver::EAudioPlayerInitializingFailure, 
             aError, iId );
         }
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::MatoPrepareComplete() >" );
     }
 
 // -----------------------------------------------------------------------------
@@ -637,8 +639,8 @@
 //
 void CPhoneAudioPlayer::MatoPlayComplete(TInt aError)
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::MatoPlayComplete()" );
-    __PHONELOG1( EBasic, EPhoneUIView, "CPhoneAudioPlayer::MatoPlayComplete - aError(%d)",
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::MatoPlayComplete() <" );
+    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::MatoPlayComplete - aError(%d)",
         aError );
     if ( aError != KErrNone )
         {
@@ -650,6 +652,7 @@
         {
         iObserver.HandlePlayingComplete( iId );
         }
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::MatoPlayComplete() >" );
     }
 
 // -----------------------------------------------------------------------------
@@ -658,12 +661,12 @@
 //
 void CPhoneAudioPlayer::DoPlay()
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::DoPlay()" );
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::DoPlay() <" );
     __ASSERT_DEBUG( iPlayerStatus == ETonePlaying, 
         Panic( EPhoneViewGeneralError ) );
-        
+
     SetRingingTypeProperties();
-    
+
     TInt err(KErrNone);
     if ( iFormat == EFormatTone )
         {
@@ -672,7 +675,7 @@
     else if ( iFormat == EFormatTts )
         {
         iTtsPlayer->Play();
-        }        
+        }
     else
         {
         TRAP( err,i3DPlugin = C3DRingingToneInterface::NewL( KNullUid ) );
@@ -685,28 +688,27 @@
             {
             if ( !iAudioOutput )
                  {
-                 __PHONELOG( EBasic, EPhoneUIView, "CPhoneAudioPlayer::DoPlay c aud ");
+                 PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::DoPlay c aud ");
                  TRAP (err, iAudioOutput = CAudioOutput::NewL( *iSamplePlayer ) );
                 if ( err )
                     {
-                    __PHONELOG1(EBasic, EPhoneUIView, 
-                        "P.AudPlayer.DoPlay.iAudioOutput.err ", err );
-                    }                      	        
+                    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::DoPlay iAudioOutput.err ", err );
+                    }
                }
             if ( !err && iAudioOutput )
                  {
-                 __PHONELOG( EBasic, EPhoneUIView, "CPhoneAudioPlayer::DoPlay EALL ");
+                 PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::DoPlay EALL ");
                  TRAP (err, iAudioOutput->SetAudioOutputL( CAudioOutput::EAll ) );
                  if ( err )
                      {
-                     __PHONELOG1( EBasic, EPhoneUIView, 
-                         "P.AudPlayer.DoPlay.SetAudioOutputL.err ", err );   
+                     PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::DoPlay SetAudioOutputL.err ", err ); 
                      }
 
                  }
             iSamplePlayer->Play();
             }
         }
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::DoPlay() >" );
     }
 
 // -----------------------------------------------------------------------------
@@ -715,10 +717,10 @@
 //
 void CPhoneAudioPlayer::SetRingingTypeProperties()
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::SetRingingTypeProperties()" );
-    __PHONELOG2( EBasic, EPhoneUIView, "CPhoneAudioPlayer::SetRingingTypeProperties - iFormat(%d), iRingType(%d)",
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::SetRingingTypeProperties() <" );
+    PHONEUIVIEW_PRINTF2( "CPhoneAudioPlayer::SetRingingTypeProperties - iFormat(%d), iRingType(%d)",
         iFormat, iRingType );
-    TInt rampTime( 0 );     
+    TInt rampTime( 0 ); 
     if ( iFormat == EFormatTone )
         {
         switch ( iRingType )
@@ -726,7 +728,7 @@
             case ETypeRinging:
                 //If we have TTS activated and ringingtype is ringing:
                 //We need to play TTS sequence again when ringingtone restarts.
-                //Thats why we need to set ringingtype to ETypeRingingOnce because  
+                //Thats why we need to set ringingtype to ETypeRingingOnce because
                 //it is the only way of knowing when ringingtone is completed. 
                 //Then we can restart it with new TTS iterations.
                 if ( iTTsToBePlayed )
@@ -736,10 +738,7 @@
                         TTimeIntervalMicroSeconds(
                         KPhoneRingingRepeatsTrailPause ) ); 
                     iTonePlayer->SetVolume( ConvertVolume( iVolume ) );
-                    __PHONELOG1( 
-                        EBasic, 
-                        EPhoneUIView, 
-                        "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing tone with TTS, Set volume(%d) and ring once",
+                    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing tone with TTS, Set volume(%d) and ring once",
                         iVolume );
                     }
                 else
@@ -748,10 +747,7 @@
                         TTimeIntervalMicroSeconds( 
                          KPhoneRingingRepeatsTrailPause ) );
                     iTonePlayer->SetVolume( ConvertVolume( iVolume ) );
-                    __PHONELOG1( 
-                        EBasic, 
-                        EPhoneUIView, 
-                        "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing tone, Set volume(%d)",
+                    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing tone, Set volume(%d)",
                         iVolume );
                     }
                 break;
@@ -762,10 +758,7 @@
                     TTimeIntervalMicroSeconds(
                     KPhoneRingingRepeatsTrailPause ) ); 
                 iTonePlayer->SetVolume( ConvertVolume( iVolume ) );
-                __PHONELOG1( 
-                    EBasic, 
-                    EPhoneUIView, 
-                    "CPhoneAudioPlayer::SetRingingTypeProperties - Ring once tone, set volume(%d)",
+                PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::SetRingingTypeProperties - Ring once tone, set volume(%d)",
                     iVolume );
                 break;
 
@@ -780,10 +773,7 @@
                     {
                     //rampTime in this case is only 3 seconds and volume is 1.
                     rampTime = KPhoneAudioAscendingRampDuration;
-                    __PHONELOG1( 
-                        EBasic, 
-                        EPhoneUIView, 
-                        "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending tone with TTS, Start from lowest volume, rampTime(%d)",
+                    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending tone with TTS, Start from lowest volume, rampTime(%d)",
                         rampTime );
                     iTonePlayer->SetVolumeRamp( 
                         TTimeIntervalMicroSeconds( rampTime ) ); 
@@ -795,16 +785,13 @@
                     {
                     //rampTime: time for one step * volume level
                     rampTime = KPhoneAudioAscendingRampDuration*iVolume;
-                    __PHONELOG2( 
-                        EBasic, 
-                        EPhoneUIView, 
-                        "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending tone, Set volume(%d), rampTime(%d)",
+                    PHONEUIVIEW_PRINTF2( "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending tone, Set volume(%d), rampTime(%d)",
                         iVolume, rampTime );
                     iTonePlayer->SetVolumeRamp( 
                         TTimeIntervalMicroSeconds( rampTime ) );
-                        
+
                     iCurrentVolume = 1; //we start from the lowest volume
-                    iTonePlayer->SetVolume( ConvertVolume( iVolume ) );       
+                    iTonePlayer->SetVolume( ConvertVolume( iVolume ) ); 
                     }
                 break;
 
@@ -813,10 +800,7 @@
                 break;
             }
 
-        __PHONELOG3( 
-            EBasic, 
-            EPhoneUIView, 
-            "CPhoneAudioPlayer::SetRingingTypeProperties - Tone, iPriority(%d), iPreference(%d), iVolume(%d)",
+        PHONEUIVIEW_PRINTF3( "CPhoneAudioPlayer::SetRingingTypeProperties - Tone, iPriority(%d), iPreference(%d), iVolume(%d)",
             iPriority, iPreference, iVolume );
 
         //Set priority and preference
@@ -837,21 +821,15 @@
                     TTimeIntervalMicroSeconds( 
                     KPhoneRingingRepeatsTrailPause ) );
                 iTtsPlayer->SetVolume( ConvertVolume( iVolume ) );
-                __PHONELOG1( 
-                    EBasic, 
-                    EPhoneUIView, 
-                    "CPhoneAudioPlayer::SetRingingTypeProperties - TTS, Set volume(%d)",
+                PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::SetRingingTypeProperties - TTS, Set volume(%d)",
                     iVolume );
                 break;
-            
+
             default:
                 __ASSERT_DEBUG( EFalse, 
                         Panic( EPhoneViewCaseNotHandled ) );
             }
-        __PHONELOG( 
-            EBasic, 
-            EPhoneUIView, 
-            "CPhoneAudioPlayer::SetRingingTypeProperties - TTS" );
+        PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::SetRingingTypeProperties - TTS" );
         }
     else
         {
@@ -860,7 +838,7 @@
             case ETypeRinging:
                 //If we have TTS activated and ringingtype is ringing:
                 //We need to play TTS sequence again when ringingtone restarts.
-                //Thats why we need to set ringingtype to ETypeRingingOnce because  
+                //Thats why we need to set ringingtype to ETypeRingingOnce because
                 //it is theonly way of knowing when ringingtone is completed. 
                 //Then we can restartit with new TTS iterations.
                 if ( iTTsToBePlayed )
@@ -870,10 +848,7 @@
                         TTimeIntervalMicroSeconds(
                         KPhoneRingingRepeatsTrailPause ) ); 
                     iSamplePlayer->SetVolume( ConvertVolume( iVolume ) );
-                    __PHONELOG1( 
-                        EBasic, 
-                        EPhoneUIView, 
-                        "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing sample with TTS, Ring only once, Set volume(%d)",
+                    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing sample with TTS, Ring only once, Set volume(%d)",
                         iVolume );
                     }
                 else
@@ -882,10 +857,7 @@
                         TTimeIntervalMicroSeconds( 
                         KPhoneRingingRepeatsTrailPause ) );
                     iSamplePlayer->SetVolume( ConvertVolume( iVolume ) );
-                    __PHONELOG1( 
-                        EBasic, 
-                        EPhoneUIView, 
-                        "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing sample, Set volume(%d)",
+                    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::SetRingingTypeProperties - Ringing sample, Set volume(%d)",
                         iVolume );
                     }
                 break;
@@ -895,10 +867,7 @@
                     TTimeIntervalMicroSeconds( 
                     KPhoneRingingRepeatsTrailPause ) ); 
                 iSamplePlayer->SetVolume( ConvertVolume( iVolume ) );
-                __PHONELOG1( 
-                    EBasic, 
-                    EPhoneUIView, 
-                    "CPhoneAudioPlayer::SetRingingTypeProperties - Ring once sample, set volume(%d)",
+                PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::SetRingingTypeProperties - Ring once sample, set volume(%d)",
                     iVolume );
                 break;
 
@@ -913,10 +882,7 @@
                     {
                     //rampTime in this case is only 3 seconds and volume is 1.
                     rampTime = KPhoneAudioAscendingRampDuration;
-                    __PHONELOG1( 
-                        EBasic, 
-                        EPhoneUIView, 
-                        "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending sample with TTS, Start from lowest volume, rampTime(%d)",
+                    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending sample with TTS, Start from lowest volume, rampTime(%d)",
                         rampTime );
                     iSamplePlayer->SetVolumeRamp( 
                         TTimeIntervalMicroSeconds( rampTime ) ); 
@@ -928,14 +894,11 @@
                     {
                     //rampTime: time for one step * volume level
                     rampTime = KPhoneAudioAscendingRampDuration*iVolume;
-                    __PHONELOG2( 
-                        EBasic, 
-                        EPhoneUIView, 
-                        "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending sample, Set volume(%d), rampTime(%d)",
+                    PHONEUIVIEW_PRINTF2( "CPhoneAudioPlayer::SetRingingTypeProperties - Ascending sample, Set volume(%d), rampTime(%d)",
                         iVolume, rampTime );
                     iSamplePlayer->SetVolumeRamp( 
                         TTimeIntervalMicroSeconds( rampTime ) );
-                        
+
                     iCurrentVolume = 1; //we start from the lowest volume
                     iSamplePlayer->SetVolume( ConvertVolume( iVolume ) );
                     }
@@ -946,96 +909,93 @@
                 break;
             }
 
-        __PHONELOG( 
-            EBasic, 
-            EPhoneUIView, 
-            "CPhoneAudioPlayer::SetRingingTypeProperties - Sample" );
+        PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::SetRingingTypeProperties - Sample" );
         }
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::SetRingingTypeProperties() >" );
     }
 
 // -----------------------------------------------------------------------------
 // CPhoneAudioPlayer::SetNewVolumeAndRamptime
 // -----------------------------------------------------------------------------
-//    
+//
 void CPhoneAudioPlayer::SetNewVolumeAndRamptime( TInt aVolume, TInt aRamptime )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneAudioPlayer::SetNewVolumeAndRamptime()" );
-   
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::SetNewVolumeAndRamptime() <" );
+ 
     //Check that volume is in valid range.
-   TInt volume = aVolume<1 ? 1:aVolume;
-    __PHONELOG1( EBasic, EPhoneUIView, "CPhoneAudioPlayer::SetNewVolumeAndRamptime - aVolume(%d)",
+    TInt volume = aVolume<1 ? 1:aVolume;
+    PHONEUIVIEW_PRINTF( "CPhoneAudioPlayer::SetNewVolumeAndRamptime - aVolume(%d)",
         aVolume ); 
-            
+
     if ( iFormat == EFormatTone && iTonePlayer )
         {
         iTonePlayer->SetVolumeRamp(TTimeIntervalMicroSeconds( aRamptime ) );
         iTonePlayer->SetVolume( ConvertVolume( volume ) );
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneAudioPlayer::SetNewVolumeAndRamptime - Tone player" );
+        PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::SetNewVolumeAndRamptime - Tone player" );
         }
     else if ( iFormat == EFormatTts && iTtsPlayer )
         {
         iTtsPlayer->SetVolumeRamp(TTimeIntervalMicroSeconds( aRamptime ) );
         iTtsPlayer->SetVolume( ConvertVolume( volume ) );
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneAudioPlayer::SetNewVolumeAndRamptime - TTS player" );
+        PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::SetNewVolumeAndRamptime - TTS player" );
         }
     else 
         {
         iSamplePlayer->SetVolumeRamp(TTimeIntervalMicroSeconds( aRamptime ) );
         iSamplePlayer->SetVolume( ConvertVolume( volume ) );
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneAudioPlayer::SetNewVolumeAndRamptime - Sample player" );
+        PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::SetNewVolumeAndRamptime - Sample player" );
         }
-   
+ 
+    PHONEUIVIEW_PRINT( "CPhoneAudioPlayer::SetNewVolumeAndRamptime() >" );
     }
-   
+ 
 
 // -----------------------------------------------------------------------------
 // CPhoneAudioPlayer::ConvertVolume
 // -----------------------------------------------------------------------------
-//  
+//
 TInt CPhoneAudioPlayer::ConvertVolume( TInt aVolume )
     {
-    //_DDPRINT( 5, "P.AudPlayer.ConvertVolume.aVolume", aVolume );
+    TInt result( 0 );
 
-    TInt result( 0 );    
-    
     if ( iFormat == EFormatTone && iTonePlayer )
         {
         result = iTonePlayer->MaxVolume() * aVolume / KMaxVolumeLevel;
         }
     else if ( iFormat == EFormatTts && iTtsPlayer )
         {
-        result = iTtsPlayer->MaxVolume() * aVolume / KMaxVolumeLevel;    
+        result = iTtsPlayer->MaxVolume() * aVolume / KMaxVolumeLevel;
         }
     else
         {
-        result = iSamplePlayer->MaxVolume() * aVolume / KMaxVolumeLevel;       
+        result = iSamplePlayer->MaxVolume() * aVolume / KMaxVolumeLevel; 
         }
-        
-	// if user has selected minimum volume level
-	// set HW volume 1
+
+    // if user has selected minimum volume level
+    // set HW volume 1
     if ( aVolume == KMinVolumeLevel && result == 0 )
         {
         result = 1; 
         }
-       
-    //_DDPRINT( 5, "P.AudPlayer.ConvertVolume.result", result );       
-    return result;    
+ 
+    //_DDPRINT( 5, "P.AudPlayer.ConvertVolume.result", result ); 
+    return result;
     }
 
-       
+ 
 // -----------------------------------------------------------------------------
 // CPhoneAudioPlayer::SetTTsToBePlayed
 // -----------------------------------------------------------------------------
-//  
+//
 void CPhoneAudioPlayer::SetTTsToBePlayed( TBool aTTsToBePlayed )
-	{
-	iTTsToBePlayed = aTTsToBePlayed;
-	}  
+    {
+    iTTsToBePlayed = aTTsToBePlayed;
+    }
 
 // -----------------------------------------------------------------------------
 // CPhoneAudioPlayer::MutePlaying
 // -----------------------------------------------------------------------------
-//	
+//
 void CPhoneAudioPlayer::MutePlaying()
     {
     //_DPRINT( 5, "P.Aud.Mute" );
@@ -1051,14 +1011,14 @@
             }
         else // EFormatSample
             {
-            iSamplePlayer->SetVolume(0);        
+            iSamplePlayer->SetVolume(0);
             }
         }
     else
         {
         // Mute called during EToneLoading state.
-        iToBePlaying = EFalse;    
-        }                   
+        iToBePlaying = EFalse;
+        } 
     }
-   
-//  End of File  
+ 
+//  End of File
--- a/phoneapp/phoneuiview/src/cphonenote.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/src/cphonenote.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -21,6 +21,8 @@
 #include "phoneui.hrh"
 #include <featmgr.h>
 
+#include <eikcba.h>
+
 // ================= MEMBER FUNCTIONS =======================
 // C++ default constructor can NOT contain any code, that
 // might leave.
@@ -40,6 +42,23 @@
     }
 
 // ---------------------------------------------------------
+// CPhoneNote::PreLayoutDynInitL
+// ---------------------------------------------------------
+//
+void CPhoneNote::PreLayoutDynInitL()
+    {
+    CEikButtonGroupContainer& cba = ButtonGroupContainer();
+    CEikCba* eikCba = static_cast< CEikCba* >( cba.ButtonGroup() );
+    
+    if ( eikCba )
+        {
+        eikCba->EnableItemSpecificSoftkey( EFalse );
+        }
+    
+    CAknNoteDialog::PreLayoutDynInitL();
+    }
+
+// ---------------------------------------------------------
 // CPhoneNote::OfferKeyEventL
 // ---------------------------------------------------------
 //
--- a/phoneapp/phoneuiview/src/cphonenotecontroller.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/src/cphonenotecontroller.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -40,7 +40,6 @@
 #include "cphonetimer.h"
 #include "cphonenote.h"
 #include "cphonedtmfsendingnote.h"
-#include "cphoneuidisablednote.h"
 
 // CONSTANTS
 const TInt KPhoneIntervalDivider = 100;
@@ -144,13 +143,6 @@
             tone = noteParam->Tone();
             break;
 
-        case EPhoneNoteUIDisabled:
-            // Use the specified values
-            resourceId = noteParam->ResourceId();
-            timeout = CAknNoteDialog::ENoTimeout;
-            tone = CAknNoteDialog::ENoTone;
-            break;
-            
         default:
             Panic( EPhoneViewCaseNotHandled );
             break;
@@ -161,10 +153,6 @@
 		{
 		iNote = new ( ELeave ) CPhoneDtmfSendingNote( reinterpret_cast<CEikDialog**>( &iNote ), *iEikEnv.EikAppUi() );						
 		}
-	else if( noteParam->Type() == EPhoneNoteUIDisabled )
-        {
-        iNote = new ( ELeave ) CPhoneUIDisabledNote( reinterpret_cast<CEikDialog**>( &iNote ), *iEikEnv.EikAppUi() );
-        }
 	else
 		{
 		iNote = new ( ELeave ) CPhoneNote( reinterpret_cast<CEikDialog**>( &iNote ), *iEikEnv.EikAppUi() );			
--- a/phoneapp/phoneuiview/src/cphoneringingtoneplayerao.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/src/cphoneringingtoneplayerao.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -17,8 +17,6 @@
 
 
 // INCLUDE FILES
-#include "cphoneringingtoneplayerao.h"
-
 #include <cntdef.h>
 #include <f32file.h>
 #include <featmgr.h>
@@ -33,6 +31,7 @@
 #include <DRMHelper.h>
 #include <activeidle2domainpskeys.h>
 
+#include "cphoneringingtoneplayerao.h"
 #include "phoneui.pan"
 #include "phoneui.hrh"
 #include "mphoneringingtoneobserver.h"
@@ -44,7 +43,6 @@
 #include "tphonecmdparamringtone.h"
 #include "cphonepubsubproxy.h"
 #include "cphonecenrepproxy.h"
-#include "cphonemediatorsender.h"
 
 // CONSTANTS
 
@@ -62,7 +60,7 @@
     {
     CPhoneRingingTonePlayerAO* self = 
         new ( ELeave ) CPhoneRingingTonePlayerAO();
-    
+
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
@@ -75,8 +73,7 @@
 // -----------------------------------------------------------------------------
 //
 CPhoneRingingTonePlayerAO::CPhoneRingingTonePlayerAO() :
-    CActive( CActive::EPriorityStandard ),
-    iAsyncDeletePlayers( EPlayerCount )
+    CActive( CActive::EPriorityStandard )
     {
     CActiveScheduler::Add( this );
     }
@@ -88,16 +85,12 @@
 void CPhoneRingingTonePlayerAO::ConstructL()
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::ConstructL()" );
-    
-    for ( TInt i = EPlayerFirst; i <= EPlayerLast; i++ )
-        {
-        User::LeaveIfError( 
-            iAsyncDeletePlayers.Append( NULL ) );
-        }
+
+    // Connect to the tone server
+    User::LeaveIfError( iToneServer.Connect() );
 
     // Construct timer.
     iTimer = CPhoneTimer::NewL();
-    iTtsDelayTimer = CPhoneTimer::NewL();
 
     // Checks if DRM extend security is needed
     TInt extSecNeeded = KErrNone;
@@ -105,36 +98,37 @@
         KCRUidMusicPlayerFeatures,
         KRequireDRMInPlayback,
         extSecNeeded );
- 
+
     iExtSecNeeded = ( ( err == KErrNone ) && extSecNeeded ) ? ETrue : EFalse;
-    
-    
+    iToneServer.SetExtendedSecurityNeeded( iExtSecNeeded );
+
     CPhoneCenRepProxy::Instance()->NotifyChangeL(
         KCRUidDRMHelperServer, 
         KDRMHelperServerNotificationPassive,
         this );
-    
 
     // Check video player configuration.
     iArbitraryVideoScaling = 
     CPhoneCenRepProxy::Instance()->IsTelephonyFeatureSupported( 
             KTelephonyLVFlagArbitraryVideoScaling );
- 
+
     // Construct the default ringing tone
     TBuf<KMaxFileName> defaultTone;
-    err = CPhoneCenRepProxy::Instance()->GetString(            
+    err = CPhoneCenRepProxy::Instance()->GetString(
         KCRUidProfileEngine,
         KProEngDefaultRingingTone,
         defaultTone );
 
     if ( err == KErrNone )
         {
-        iDefaultRingingTone = CPhoneRingingTone::NewL( defaultTone );
+        iToneServer.SetDefaultRingingToneL( defaultTone );
         }
 
-    ConstructPlayers();
-    
+    // Get maximum tone file size
     GetMaxToneFileSizeL( iToneFileSizeLimitKB );
+
+    // And set the tone size limit to the tone server too
+    iToneServer.SetToneFileSizeLimit( iToneFileSizeLimitKB );
     }
 
 // -----------------------------------------------------------------------------
@@ -144,15 +138,9 @@
 CPhoneRingingTonePlayerAO::~CPhoneRingingTonePlayerAO()
     {
     Cancel();
-    
-    iAsyncDeletePlayers.ResetAndDestroy();
-    iAsyncDeletePlayers.Close();
-        
-    CleanupPlayers();
+    iToneServer.Close();
 
     delete iTimer;
-    delete iTtsDelayTimer;
-    delete iDefaultRingingTone;
     delete iAudioVideoRingingTone;
     }
 
@@ -165,16 +153,21 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayRingToneL()" );
 
-    if ( aCommandParam->ParamId() == 
-        TPhoneCommandParam::EPhoneParamIdRingTone )
+    // Check that the parameter is a ringing tone
+    if ( aCommandParam->ParamId() == TPhoneCommandParam::EPhoneParamIdRingTone )
         {
+        // Cast to get the ringing tone parameters
         TPhoneCmdParamRingTone* ringToneParam = 
             static_cast<TPhoneCmdParamRingTone*>( aCommandParam );
 
+        // Get volume and ringing tone type
         const TInt volume = ringToneParam->Volume();
         TProfileRingingType ringingType = 
             static_cast<TProfileRingingType>( ringToneParam->RingingType() );
-        
+
+        // Set ringing tone file name to server
+        iToneServer.SetRingingToneL( ringToneParam->RingTone() );
+
         if ( !iAudioVideoRingingTone )
             {
             iAudioVideoRingingTone = CPhoneRingingTone::NewL(
@@ -186,7 +179,7 @@
             iAudioVideoRingingTone->SetFileName(
                 ringToneParam->RingTone() );
             }
-        
+
         // Caller contact text and image and image has
         // higher priority than video ringing tone set for caller.
         if ( iAudioVideoRingingTone->IsVideoRingingTone() &&
@@ -199,7 +192,7 @@
             }
         else if ( iAudioVideoRingingTone->IsVideoRingingTone() &&
                 !ringToneParam->IsCallerText() )
-            {            
+            {
             // Play video ring tone
             const TBool ringToneIsPersonal = ringToneParam->Type() ==
                 EPhoneRingTonePersonal;
@@ -235,64 +228,7 @@
     TInt aVolume, 
     TProfileRingingType aRingingType )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayAudioRingTone()" );
-    __PHONELOG2( 
-        EBasic,
-        EPhoneUIView, 
-        "CPhoneRingingTonePlayerAO::PlayAudioRingTone - aVolume(%d), aRingingType(%d)",
-        aVolume,
-        aRingingType );
- 
-    if ( !iAudioVideoRingingTone ||
-         !CheckAndHandleToneSizeLimit( iAudioVideoRingingTone ) )
-        {
-        PlayDefaultTone( aVolume, aRingingType );
-        }
-    else if ( aRingingType == EProfileRingingTypeSilent )
-        {
-        PlaySilentTone();
-        }
-    else if ( aRingingType == EProfileRingingTypeBeepOnce )
-        {
-        BeepOnce( aVolume );
-        }
-    else
-        {
-        // Construct player for line 1.
-        if ( !iAudioPlayer )
-            {
-            iAudioPlayer = ConstructTonePlayer( 
-                *iAudioVideoRingingTone, 
-                EPlayerAudio );
-            if ( !iTimer->IsActive() )
-                {
-                // Start timer, since the player is constructed.
-                iTimer->After( KPhoneMaxRingingWaiting, this );
-                }
-            }
-
-        // Start playing.
-        if ( !iAudioPlayer )
-            {
-            iTimer->Cancel();
-            PlayDefaultTone( aVolume, aRingingType );
-            }
-        else
-            {
-            __PHONELOG( 
-                EBasic, 
-                EPhoneUIView, 
-                "CPhoneRingingTonePlayerAO::PlayAudioRingTone - Start playing audio" );
-            iVolume = aVolume;
-            iRingingType = aRingingType;
-            AddTtsPlaybackIfNeeded( aRingingType );
-            iTonePlayingStatus = EAudioTonePlaying;
-            iAudioPlayer->Play( 
-                ConvertRingingType( aRingingType ),
-                aVolume,
-                iTtsToneToBePlayed );
-            }
-        }
+    iToneServer.PlayAudioRingTone( aVolume, aRingingType );
     }
 
 // -----------------------------------------------------------------------------
@@ -301,25 +237,7 @@
 //
 void CPhoneRingingTonePlayerAO::BeepOnce( TInt aVolume )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::BeepOnce()" );
-    __PHONELOG1( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::BeepOnce - aVolume(%d)",
-        aVolume );
-
-    if ( !iBeepOncePlayer )
-        {
-        ConstructSequencePlayer( EPlayerBeepOnce );
-        }
-
-    if ( iBeepOncePlayer )
-        {
-        __PHONELOG( 
-            EBasic, 
-            EPhoneUIView, 
-            "CPhoneRingingTonePlayerAO::BeepOnce - Play" );
-        iTonePlayingStatus = EBeepOnce;
-        iBeepOncePlayer->Play( CPhoneAudioPlayer::ETypeRingingOnce, 
-            aVolume, EFalse );        
-        }
+    iToneServer.BeepOnce( aVolume );
     }
 
 // -----------------------------------------------------------------------------
@@ -328,24 +246,7 @@
 //
 void CPhoneRingingTonePlayerAO::PlaySilentTone()
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::PlaySilentTone()" );
-
-    if ( !iSilentPlayer )
-        {
-        ConstructSequencePlayer( EPlayerSilent );
-        }
-
-    __ASSERT_DEBUG( iSilentPlayer, Panic( EPhoneViewGeneralError ) );
-
-    if ( iSilentPlayer )
-        {
-        __PHONELOG( 
-            EBasic, 
-            EPhoneUIView, 
-            "CPhoneRingingTonePlayerAO::PlaySilentTone - play" );
-        iTonePlayingStatus = ESilentTonePlaying;
-        iSilentPlayer->Play( CPhoneAudioPlayer::ETypeRinging, 0, EFalse );        
-        }
+    iToneServer.PlaySilentTone();
     }
 
 // -----------------------------------------------------------------------------
@@ -354,19 +255,7 @@
 //
 void CPhoneRingingTonePlayerAO::PlayUnsecureVoIPTone()
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayUnsecureVoIPTone()" );
-    if ( !iUnsecureVoIPTonePlayer )
-        {
-        ConstructSequencePlayer( EPlayerUnsecureVoIP );
-        }
-    __ASSERT_DEBUG( iUnsecureVoIPTonePlayer, Panic( EPhoneViewGeneralError ) );
-
-    if ( iUnsecureVoIPTonePlayer )
-        {
-        iTonePlayingStatus = EUnsecureVoIPTonePlaying;
-        iUnsecureVoIPTonePlayer->Play( CPhoneAudioPlayer::ETypeRingingOnce,
-            KPhoneDefaultVolume, EFalse );
-        }
+    iToneServer.PlayUnsecureVoIPTone();
     }
 
 // -----------------------------------------------------------------------------
@@ -376,19 +265,19 @@
 void CPhoneRingingTonePlayerAO::MuteRingingToneOnAnswer()
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::MuteRingingToneOnAnswer()" );
-    
+
     if ( iVideoPlayer &&
             ( iTonePlayingStatus == EVideoTonePlaying ||
-         iTonePlayingStatus == EPersonalVideoTonePlaying ) )
+              iTonePlayingStatus == EPersonalVideoTonePlaying ) )
         {
         // Mute the video audio
         iVideoPlayer->MuteVideoRingTone();
         iTonePlayingStatus = ESilentVideoTonePlaying;
         iVolume = 0;
         }
-    else
+    else if ( iTonePlayingStatus != ESilentVideoTonePlaying )
         {
-        DoMuteRingingTone();
+        iToneServer.MuteRingingTone();
         }
     }
 
@@ -399,17 +288,17 @@
 void CPhoneRingingTonePlayerAO::MuteRingingTone()
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::MuteRingingTone()" );
-    
+
     if ( iVideoPlayer &&
             ( iTonePlayingStatus == EVideoTonePlaying ||
-         iTonePlayingStatus == EPersonalVideoTonePlaying )  )
+              iTonePlayingStatus == EPersonalVideoTonePlaying ) )
         {
         // Mute the video audio
         iVideoPlayer->MuteVideoRingTone();
         iTonePlayingStatus = ESilentVideoTonePlaying;
         iVolume = 0;
         }
-    else
+    else if ( iTonePlayingStatus != ESilentVideoTonePlaying )
         {
         StopPlaying();
         }
@@ -423,104 +312,17 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::StopPlaying()" );
 
-    iTtsToneToBePlayed = EFalse;
-    iTTsTimeOutCounter = 0;
-    iTtsDelayTimer->Cancel();
-    if ( iTtsPlayer )
-        {
-        iTtsPlayer->StopPlaying();
-        delete iTtsPlayer;
-        iTtsPlayer = NULL;
-        }
-    iTimer->Cancel();
+    // Stop all playback
 
-    switch( iTonePlayingStatus )
+    iToneServer.StopPlaying();
+
+    if ( iVideoPlayer )
         {
-        case EAudioTonePlaying:
-            if( iAudioPlayer )
-                {
-                // Commented stopping out, since with this, the screen is jammed
-                // when REComSession::FinalClose() is reached in 
-                // CPhoneAudioPlayer's destructor.
-                // Audio player is stopped anyway in its destructor.
-                // Fixes EKKI-7WYG2G and JKAN-7XNGQU.
-                // iAudioPlayer->StopPlaying();                
-                delete iAudioPlayer;
-                iAudioPlayer = NULL;
-                }
-            break;
-        case EDefaultTonePlaying:
-            if ( iDefaultPlayer )
-                {
-                iDefaultPlayer->StopPlaying();
-                delete iDefaultPlayer;
-                iDefaultPlayer = NULL;
-                }
-            break;
-        case EBeepOnce:
-            if( iBeepOncePlayer )
-                {
-                iBeepOncePlayer->StopPlaying();
-                delete iBeepOncePlayer;
-                iBeepOncePlayer = NULL;
-                }
-            break;
-        case EBackupTonePlaying:
-            if( iBackupPlayer )
-                {
-                iBackupPlayer->StopPlaying();
-                }
-            break;
-        case ESilentTonePlaying:
-            if( iSilentPlayer )
-                {
-                iSilentPlayer->StopPlaying();
-                delete iSilentPlayer;
-                iSilentPlayer = NULL;
-                }
-            break;
-        case EUnsecureVoIPTonePlaying:
-            if( iUnsecureVoIPTonePlayer )
-                {
-                iUnsecureVoIPTonePlayer->StopPlaying();
-                delete iUnsecureVoIPTonePlayer;
-                iUnsecureVoIPTonePlayer = NULL;
-                }
-            break;
-        case EVideoTonePlaying: // video ringing tone
-        case EPersonalVideoTonePlaying:
-        case ESilentVideoTonePlaying:
-            if ( iBeepOncePlayer != NULL )
-                {
-                iBeepOncePlayer->StopPlaying();
-                delete iBeepOncePlayer;
-                iBeepOncePlayer = NULL;                    
-                }
-                
-            if ( iSilentPlayer != NULL )
-                {
-                iSilentPlayer->StopPlaying();
-                delete iSilentPlayer;
-                iSilentPlayer = NULL;                    
-                }    
-            if ( iVideoPlayer )
-                {
-                iVideoPlayer->StopVideoRingTone();
-                }
-            if ( iAudioVideoRingingTone )
-                {
-                delete iAudioVideoRingingTone;
-                iAudioVideoRingingTone = NULL;    
-                }
-            break;
-        case EIdle:
-            // Do nothing here.
-            return;
-        default:
-            Panic( EPhoneViewCaseNotHandled );
-            break;
+        iVideoPlayer->StopVideoRingTone();
         }
 
+    iTimer->Cancel();
+
     iTonePlayingStatus = EIdle;
     }
 
@@ -533,275 +335,7 @@
     TInt aVolume,
     TProfileRingingType aRingingType )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayTtsTone()" );
-    __PHONELOG2( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayTtsTone - aVolume(%d), aRingingType(%d)",
-        aVolume, aRingingType );
-
-    if ( iTtsPlayer )
-        {
-        delete iTtsPlayer;
-        iTtsPlayer = NULL;
-        }
-
-    //Set ringingtype for Tts.
-    iTtsRingingType = aRingingType;
-    iTtsVolume = aVolume;
-
-    // TTS should be a bit louder, than main component.
-    // No need to check for overflows, they are handled in SET_PHONE_VOLUME macro.
-    
-    TPtrC ttsHeader( KPhoneTtsHeader );
-    HBufC* preparedString = 
-        HBufC::New( aTextToSay.Length() + ttsHeader.Length() );
-
-    if ( preparedString )
-        {
-        TPtr pPreparedString = preparedString->Des();
-        pPreparedString.Append( ttsHeader );
-        pPreparedString.Append( aTextToSay );
-           
-        __PHONELOG1( 
-            EBasic, 
-            EPhoneUIView, 
-            "CPhoneRingingTonePlayerAO::PlayTtsTone - about to say %S",
-            &pPreparedString );
-
-        TRAPD( 
-            error, 
-            iTtsPlayer = CPhoneAudioPlayer::NewTtsL( 
-               *preparedString, 
-               KAudioPriorityPhoneCall, 
-               KAudioPrefTextToSpeechCallHardCoded,
-               *this, 
-               EPlayerTts ) );
-        if( error == KErrNone ) 
-            {
-            // To be played when default or personal tone will be played
-            iTtsToneToBePlayed = ETrue;
-            }
-        __PHONELOG2(
-            EBasic,
-            EPhoneUIView,
-            "CPhoneRingingTonePlayerAO::PlayTtsTone - error(%d), iTtsPhoneToBePlayed(%d)",
-            error, 
-            iTtsToneToBePlayed );
-
-        delete preparedString;  
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::HandleAudioPlayerError
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::HandleAudioPlayerError( 
-    TPhoneAudioPlayerErrorEvent /*aEvent*/, 
-    TInt aError, 
-    TInt /*aId*/ )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::HandleAudioPlayerError()" );
-    // This is called from CPhoneAudioPlayer - we do not 
-    // want to delete instances from which this method
-    // is called.
-    
-     __PHONELOG1( EBasic, 
-                 EPhoneUIView, 
-                 "CPhoneRingingTonePlayerAO::HandleAudioPlayerError - error (%d)",
-                 aError ); 
-
-    const TBool deleteAll = ( aError == KErrServerTerminated );
-
-    if ( deleteAll )
-        {
-        // KErrServerTerminated is considered as fatal error. So we
-        // need to delete everything.
-
-        for ( TInt i = EPlayerFirst; i <= EPlayerLast; i++ )
-            {
-            DeletePlayerAsync( static_cast< TPlayerId >( i ) );
-            }
-
-        // Now all member audio players point to NULL, except
-        // those players in iAsyncDeletePlayers. Recreate 
-        // players.
-
-        ConstructPlayers(); // Ignore error code.
-        }
-
-    iTimer->Cancel();
-    DoHandlePlayerError( !deleteAll, EFalse );
-    }
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::HandleAudioPlayerInitComplete
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::HandleAudioPlayerInitComplete( TInt aId )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::HandleAudioPlayerInitComplete()" );
-    // This is called from CPhoneAudioPlayer - we do not 
-    // want to delete instances from which this method
-    // is called. 
-
-    if ( iTonePlayingStatus == EAudioTonePlaying && aId == EPlayerAudio ||
-        iTonePlayingStatus == EDefaultTonePlaying && aId == EPlayerDefault )
-        {
-        iTimer->Cancel();
-        }
-   
-    if( iTtsToneToBePlayed && ( aId != EPlayerTts ) )  
-        {
-        // Start TTS timer just before "normal ringtone component" starts 
-        // playing, i.e. after init completed.
-        if ( iTtsDelayIndex < iTtsDelaysCount )  
-            {
-            if ( !iTtsDelayTimer->IsActive() )
-                {
-                // There are TTS iterations to be played yet.
-                iTtsDelayTimer->After( 
-                    KPhoneTtsDelays[iTtsDelayIndex], 
-                    TCallBack( HandleTtsDelayTimeout, this ) );
-                }
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::HandlePlayingComplete
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::HandlePlayingComplete( TInt aId )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::HandlePlayingComplete()" );
-    // This is called from CPhoneAudioPlayer - we do not 
-    // want to delete instances from which this method
-    // is called. 
-
-    __PHONELOG2(
-        EBasic, 
-        EPhoneUIView,
-        "CPhoneRingingTonePlayerAO::HandlePlayingComplete - aId(%d), iRingingType(%d)",
-        aId,
-        iRingingType );
-    __PHONELOG2(
-        EBasic, 
-        EPhoneUIView,
-        "CPhoneRingingTonePlayerAO::HandlePlayingComplete - iTtsToneToBePlayed(%d), iTtsDelayIndex(%d)",
-        iTtsToneToBePlayed,
-        iTtsDelayIndex );
-
-    if ( aId == EPlayerTts ) 
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::HandlePlayingComplete - resuming after TTS" );
-
-        // TTS playing complete, normal tone player should volume up.
-        if ( ( iTtsToneToBePlayed ) && ( ++iTtsDelayIndex < iTtsDelaysCount ) )  
-            {
-            __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::HandlePlayingComplete - resuming after TTS first time" );
-            //Callers name is said once. increase tone player volume.    
-            SolveNewVolumeAndRamptime( ESaidOnce );
-            
-            if ( !iTtsDelayTimer->IsActive() )
-                {
-                // There are TTS iterations to be played yet.
-                iTtsDelayTimer->After( KPhoneTtsDelays[iTtsDelayIndex], 
-                    TCallBack( HandleTtsDelayTimeout,this ) );
-                }
-            }
-        else
-            {
-            __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::HandlePlayingComplete - resuming after TTS second time" );
-            SolveNewVolumeAndRamptime( ESaidTwice );
-            }
-        
-        // No further processing. All TTS player-related events are not 
-        // "real" ringtone playing completions.
-        return;
-        }
-    //Case: RingintonePlayer has completed playing with following set: ring once and
-    // TTS is activated   
-    else if ( iRingingType == EProfileRingingTypeRingingOnce && 
-        iTtsToneToBePlayed )   
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::HandlePlayingComplete - ring once and TTS" );
-         if ( iTtsDelayIndex < iTtsDelaysCount )
-            {
-            ReStartRingingTonePlayer();
-            //Do not destroy player yet. Return.
-            return;            
-            }
-        }
-    //Case: RingintonePlayer has completed playing with following set: ringing 
-    //and TTS is activated. We need  to restart ringintoneplayer and new TTS
-    //iterations are required.
-    else if ( iRingingType == EProfileRingingTypeRinging && iTtsToneToBePlayed )
-        {  
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::HandlePlayingComplete - ringing and TTS" );
-        if ( iTtsDelayIndex == iTtsDelaysCount )
-            {
-            //Case: Ringingtype is EProfileRingingTypeRinging. New TTS
-            //iterations are required.    
-            __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::HandlePlayingComplete - need to restart TTS sequence" );
-            //TTS has completed its iterations,set index to zero. 
-            iTtsDelayIndex = 0;
-            if ( !iTtsDelayTimer->IsActive() )
-                {
-                //Restart TTS sequence
-                iTtsDelayTimer->After( 
-                    KPhoneTtsDelays[iTtsDelayIndex], 
-                    TCallBack( HandleTtsDelayTimeout, this ) ); 
-                }
-            }
-        
-        ReStartRingingTonePlayer();
-        //Do not destroy player yet. Return
-        return;  
-        }
-
-    __PHONELOG1( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::HandlePlayingComplete - delete player - iTonePlayingStatus(%d)",
-        iTonePlayingStatus );    
-    switch( iTonePlayingStatus )
-        {
-        case EAudioTonePlaying:
-            DeletePlayerAsync( EPlayerAudio );
-            iAudioPlayer = NULL;
-            break;
-            
-        case EDefaultTonePlaying:
-            DeletePlayerAsync( EPlayerDefault );
-            iDefaultPlayer = NULL;
-            break;
-            
-        case ESilentTonePlaying:
-            DeletePlayerAsync( EPlayerSilent );
-            iSilentPlayer = NULL;
-            break;
-
-        case EUnsecureVoIPTonePlaying:
-            DeletePlayerAsync( EPlayerUnsecureVoIP );
-            iUnsecureVoIPTonePlayer = NULL;
-            break;
-
-        case EBeepOnce:
-            DeletePlayerAsync( EPlayerBeepOnce );
-            iBeepOncePlayer = NULL;
-            break;
-            
-        case EVideoTonePlaying:
-        case EPersonalVideoTonePlaying:
-            DeletePlayerAsync( EPlayerBeepOnce );
-            iBeepOncePlayer = NULL;
-            return; // beep once + video
-            
-        case EBackupTonePlaying:
-            break;
-            
-        default:
-            Panic( EPhoneViewCaseNotHandled );
-            break;
-        }
-
-    iTonePlayingStatus = EIdle;
+    iToneServer.PlayTtsTone( aTextToSay, aVolume, aRingingType );
     }
 
 // -----------------------------------------------------------------------------
@@ -814,76 +348,11 @@
 
     // Guarding timer for startup has expired
     if ( iTonePlayingStatus == EVideoTonePlaying ||
-       iTonePlayingStatus == ESilentVideoTonePlaying ||   
-       iTonePlayingStatus == EPersonalVideoTonePlaying )
-      {
-        iVideoPlayer->CancelVideoRingTone(); // close video ringtone display
-       PlayDefaultTone( iVolume, iRingingType );
-      }
-    else
-      {
-      // Start new audio player synchronously.
-      DoHandlePlayerError( ETrue, ETrue );
-      }			
-		
-    }
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::DoHandlePlayerError
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::DoHandlePlayerError(
-    TBool aDelete,
-    TBool aSync )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::DoHandlePlayerError()" );
-    switch ( iTonePlayingStatus )
+         iTonePlayingStatus == ESilentVideoTonePlaying || 
+         iTonePlayingStatus == EPersonalVideoTonePlaying )
         {
-        case EAudioTonePlaying:
-            if ( aDelete )
-                {
-                if ( aSync )
-                    {
-                    delete iAudioPlayer;
-                    }
-                else
-                    {
-                    DeletePlayerAsync( EPlayerAudio );
-                    }
-
-                iAudioPlayer = NULL;
-                }
-
-#ifdef __WINS__
-            PlayAudioRingTone( iVolume, iRingingType );
-            iTonePlayingStatus = EDefaultTonePlaying;
-#else
-            PlayDefaultTone( iVolume, iRingingType );
-#endif
-            break;
-        case EDefaultTonePlaying:
-            if ( aDelete )
-                {
-                if ( aSync )
-                    {
-                    delete iDefaultPlayer;
-                    }
-                else
-                    {
-                    DeletePlayerAsync( EPlayerDefault );
-                    }
-
-                iDefaultPlayer = NULL;
-                }
-
-            PlayBackupTone( iVolume, iRingingType );
-            break;
-        case ESilentTonePlaying:
-        case EBeepOnce:
-        case EBackupTonePlaying:
-            break;
-        default:
-            break;
+        iVideoPlayer->CancelVideoRingTone(); // close video ringtone display
+        PlayDefaultTone( iVolume, iRingingType );
         }
     }
 
@@ -895,50 +364,7 @@
     TInt aVolume, 
     TProfileRingingType aRingingType )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayDefaultTone()" );
-
-    if( aRingingType == EProfileRingingTypeSilent ||
-        aRingingType == EProfileRingingTypeBeepOnce )
-        {
-        return;
-        }
-        
-    if ( !iDefaultRingingTone )
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayDefaultTone - default tone does not exist, play backup..." );
-        PlayBackupTone( aVolume, aRingingType );
-        return;    
-        }
-
-    // Construct player.
-    if ( !iDefaultPlayer )
-        {
-        iDefaultPlayer = ConstructTonePlayer( 
-            *iDefaultRingingTone, 
-            EPlayerDefault );
-        if ( !iTimer->IsActive() )
-            {
-            iTimer->After( KPhoneMaxRingingWaiting, this );
-            }
-        }
-
-    // Start playing.
-    if ( !iDefaultPlayer )
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayDefaultTone - player not constructed, play backup..." );
-        iTimer->Cancel();
-        PlayBackupTone( aVolume, aRingingType );
-        }
-    else
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayDefaultTone - play" );
-        iVolume = aVolume;
-        iRingingType = aRingingType;
-        iTonePlayingStatus = EDefaultTonePlaying;
-        iDefaultPlayer->Play( 
-            ConvertRingingType( aRingingType ), aVolume, iTtsToneToBePlayed );
-        }
-
+    iToneServer.PlayDefaultTone( aVolume, aRingingType );
     }
 
 // -----------------------------------------------------------------------------
@@ -949,84 +375,9 @@
     TInt aVolume, 
     TProfileRingingType aRingingType )
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayBackupTone()" );
-    __ASSERT_DEBUG( iBackupPlayer, Panic( EPhoneViewGeneralError ) );
-
-    if ( !iBackupPlayer )
-        {
-        ConstructPlayers();
-        }
-
-    if ( iBackupPlayer )
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayBackupTone - play" );
-        iTonePlayingStatus = EBackupTonePlaying;
-
-        // Cease playing text-to-speech, if necessary
-        iTtsToneToBePlayed = EFalse;
-        iTTsTimeOutCounter = 0;
-        iTtsDelayTimer->Cancel();
-        if ( iTtsPlayer )
-            {
-            iTtsPlayer->StopPlaying();
-            delete iTtsPlayer;
-            iTtsPlayer = NULL;
-            }
-
-        iBackupPlayer->Play( 
-            ConvertRingingType( aRingingType ), aVolume, EFalse );        
-        }
+    iToneServer.PlayBackupTone( aVolume, aRingingType );
     }
 
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::ConstructTonePlayer
-// -----------------------------------------------------------------------------
-//
-CPhoneAudioPlayer* CPhoneRingingTonePlayerAO::ConstructTonePlayer( 
-    const CPhoneRingingTone& aRingingTone,
-    TInt aId )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::ConstructTonePlayer()" );
-    return CPhoneAudioPlayer::New(
-        aRingingTone, 
-        KAudioPriorityPhoneCall, 
-        KAudioPrefIncomingCall,
-        *this, 
-        aId,
-        iMdaServer,
-        aId == EPlayerDefault ? EFalse : iExtSecNeeded );
-    }
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::ConvertRingingType
-// -----------------------------------------------------------------------------
-//
-CPhoneAudioPlayer::TRingingType CPhoneRingingTonePlayerAO::ConvertRingingType(
-    TProfileRingingType aRingingType )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::ConvertRingingType()" );
-
-    CPhoneAudioPlayer::TRingingType ringingType = 
-        CPhoneAudioPlayer::ETypeRinging;
-    switch ( aRingingType )
-        {
-        case EProfileRingingTypeRinging:
-            ringingType = CPhoneAudioPlayer::ETypeRinging;
-            break;
-
-        case EProfileRingingTypeAscending:
-            ringingType = CPhoneAudioPlayer::ETypeAscending;
-            break;
-
-        case EProfileRingingTypeRingingOnce:
-            ringingType = CPhoneAudioPlayer::ETypeRingingOnce;
-            break;
-
-        default:
-            break;
-        }
-    return ringingType;
-    }
 
 // -----------------------------------------------------------------------------
 // CPhoneRingingTonePlayerAO::ConvertVideoRingingType
@@ -1036,7 +387,7 @@
     TProfileRingingType aRingingType )
     {
     MPhoneVideoPlayer::TPlayMode playMode;
-        
+
     switch ( aRingingType )
         {
         case EProfileRingingTypeAscending:
@@ -1050,223 +401,10 @@
             playMode = MPhoneVideoPlayer::EPlayInLoop;
             break;
         }
-    
+
     return playMode;
     }
 
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::ConstructPlayers
-// -----------------------------------------------------------------------------
-//
-TInt CPhoneRingingTonePlayerAO::ConstructPlayers()
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::ConstructPlayers()" );
-    TRAPD( err, ConstructPlayersL() );
-    return err;
-    }
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::ConstructPlayersL
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::ConstructPlayersL()
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::ConstructPlayersL()" );
-
-    // Construct players.
-    if ( !iMdaServer )
-        {
-        iMdaServer = CMdaServer::NewL();
-        }
-
-    // Construct Backup player.
-    if ( !iBackupPlayer )
-        {
-        TFileName defaultSoundFile( KDriveZ );
-        defaultSoundFile.Append( KPhoneDefaultSoundFile );
-        iBackupPlayer = CPhoneAudioPlayer::NewL( 
-            defaultSoundFile,
-            KAudioPriorityPhoneCall,
-            KAudioPrefIncomingCall,
-            *this,
-            EPlayerBackup,
-            iMdaServer 
-            );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::ConstructSequencePlayer
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::ConstructSequencePlayer( TPlayerId aId )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::ConstructSequencePlayer()" );
-
-    // Construct players.
-    TRAPD( err, ConstructSequencePlayerL( aId ) );
-    if ( err )
-        {
-        __PHONELOG1( EBasic, EPhoneUIView, 
-        "CPhoneRingingTonePlayerAO::ConstructSequencePlayer - err(%d)", err );    
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::ConstructSequencePlayerL
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::ConstructSequencePlayerL( TPlayerId aId )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::ConstructSequencePlayerL()" );
-    // Construct beep once player
-    if ( aId == EPlayerBeepOnce )
-        {
-#ifdef __WINS__    
-        TParse* fp = new (ELeave) TParse();
-        fp->Set( KPhoneBeepOnceSoundFile, &KDC_RESOURCE_FILES_DIR, NULL ); 
-        TFileName fileName( fp->FullName() );
-        delete fp;
-
-        iBeepOncePlayer = CPhoneAudioPlayer::NewL(
-            fileName, 
-            KAudioPriorityPhoneCall,
-            KAudioPrefIncomingCall,
-            *this, 
-            EPlayerBeepOnce );
-#else
-        iBeepOncePlayer = CPhoneAudioPlayer::NewSeqL(
-            KPhoneBeepSequence(),
-            KAudioPriorityPhoneCall,
-            KAudioPrefIncomingCall,
-            *this, 
-            EPlayerBeepOnce );
-#endif // __WINS__
-        }
-
-    // Construct Silent Player.
-    else if ( aId == EPlayerSilent )
-        {
-#ifdef __WINS__
-        TParse* fp = new (ELeave) TParse();
-        fp->Set( KPhoneSilentSoundFile, &KDC_RESOURCE_FILES_DIR, NULL ); 
-        TFileName fileName( fp->FullName() );
-        delete fp;
-
-        iSilentPlayer = CPhoneAudioPlayer::NewL( 
-            fileName, 
-            KAudioPriorityPhoneCall,
-            KAudioPrefIncomingCall,
-            *this, 
-            EPlayerSilent );
-#else
-        iSilentPlayer = CPhoneAudioPlayer::NewSeqL(
-            KPhoneNoSoundSequence(),
-            KAudioPriorityPhoneCall,
-            KAudioPrefIncomingCall,
-            *this,
-            EPlayerSilent );
-#endif // __WINS__
-        }        
-    
-    else if ( aId == EPlayerUnsecureVoIP )
-        {
-#ifdef __WINS__
-        TParse* fp = new (ELeave) TParse();
-        fp->Set( KPhoneBeepOnceSoundFile, &KDC_RESOURCE_FILES_DIR, NULL ); 
-        TFileName fileName( fp->FullName() );
-        delete fp;
-
-        iUnsecureVoIPTonePlayer = CPhoneAudioPlayer::NewL( 
-            fileName, 
-            KAudioPrioritySpecialInformationTone,
-            KAudioPrefSpecialInformation,
-            *this, 
-            EPlayerUnsecureVoIP );
-#else
-        iUnsecureVoIPTonePlayer = CPhoneAudioPlayer::NewSeqL(
-            KPhoneUnsecureVoIPCall(),
-            KAudioPrioritySpecialInformationTone,
-            KAudioPrefSpecialInformation,
-            *this,
-            EPlayerUnsecureVoIP );
-#endif // __WINS__
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::CleanupPlayers
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::CleanupPlayers()
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::CleanupPlayers()" );
-
-    delete iAudioPlayer;
-    iAudioPlayer = NULL;
-
-    delete iDefaultPlayer;
-    iDefaultPlayer = NULL;
-
-    delete iBeepOncePlayer;
-    iBeepOncePlayer = NULL;
-
-    delete iSilentPlayer;
-    iSilentPlayer = NULL;
-    
-    delete iUnsecureVoIPTonePlayer;
-    iUnsecureVoIPTonePlayer = NULL;
-
-    delete iBackupPlayer;
-    iBackupPlayer = NULL;
-      
-    delete iMdaServer;
-    iMdaServer = NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::DeletePlayerAsync
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::DeletePlayerAsync( TPlayerId aPlayer )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::DeletePlayerAsync()" );
-    __ASSERT_DEBUG( aPlayer >= EPlayerFirst && aPlayer < iAsyncDeletePlayers.Count(),
-        Panic( EPhoneViewInvariant ) );
-        
-    // Player is not deleted here, but in RunL.
-    Cancel();
-
-    if ( iAsyncDeletePlayers[ aPlayer ] ) 
-        {
-        delete iAsyncDeletePlayers[ aPlayer ];
-        iAsyncDeletePlayers[ aPlayer ] = NULL;
-        }
-
-    CPhoneAudioPlayer** players[] =
-        {
-        &iAudioPlayer,
-        &iBeepOncePlayer,
-        &iSilentPlayer,
-        &iUnsecureVoIPTonePlayer,
-        &iDefaultPlayer,
-        &iBackupPlayer,
-        &iTtsPlayer
-        };
-
-    __ASSERT_DEBUG( iAsyncDeletePlayers.Count() > aPlayer, Panic( EPhoneUtilsIndexOutOfBounds ) );
-    iAsyncDeletePlayers[ aPlayer ] = 
-        *(players[ aPlayer ]);
-    *(players[ aPlayer ]) = NULL;
-
-    iState = EDeletingAudioPlayer;
-
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete( status, KErrNone );
-    SetActive();
-    }
-
 // -----------------------------------------------------------------------------
 // CPhoneRingingTonePlayerAO::RunL
 // -----------------------------------------------------------------------------
@@ -1277,27 +415,17 @@
 
     switch ( iState )
         {
-        case EDeletingAudioPlayer:
-            {
-            for ( TInt i = EPlayerFirst; i <= EPlayerLast; i++ )
-                {
-                delete iAsyncDeletePlayers[ i ];
-                iAsyncDeletePlayers[ i ] = NULL;
-                }
-            }
-            break;
-
-      case EPlayingDefaultVideo:
+        case EPlayingDefaultVideo:
             {
             PlayAudioRingTone( iVolume, iRingingType );
             }
             break;
 
-        case EIdleState:  
+        case EIdleState:
         default:
             break;
         } // switch iState
-    
+
     iState = EIdleState;
     }
 
@@ -1310,98 +438,6 @@
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::DoCancel()" );
     // Request is completed immediately before SetActive.
     }
-    
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::HandleTtsDelayTimeout
-// -----------------------------------------------------------------------------
-//
-TInt CPhoneRingingTonePlayerAO::HandleTtsDelayTimeout( TAny* object )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::HandleTtsDelayTimeout()" );
-    static_cast<CPhoneRingingTonePlayerAO*>( object )->
-        DoHandleTtsDelayTimeout();
-    return KErrNone;
-    }
-        
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::DoHandleTtsDelayTimeout
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::DoHandleTtsDelayTimeout()
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::DoHandleTtsDelayTimeout()" );
-    __PHONELOG2( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::DoHandleTtsDelayTimeout - iTtsRingingType(%d), iTTsTimeOutCounter(%d)",
-        iTtsRingingType, iTTsTimeOutCounter );
-
-    CPhoneAudioPlayer* currPlayer = NULL;
-    currPlayer = GetCurrentlyActiveAudioPlayerWithTTs();        
-    
-    if ( !currPlayer )
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::DoHandleTtsDelayTimeout - null current player" );
-        return;
-        }
-    TInt volume( 0 );
-     //Ascending case. TTs player needs to be ascending.
-    if ( iTtsRingingType == EProfileRingingTypeAscending )
-        {
-        //Volume needs to be different in different ascending steps
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::DoHandleTtsDelayTimeout - play ascending" ); 
-        if ( !iTTsTimeOutCounter )
-            {
-            //We are saying callers name for the first time in ascending mode.
-            //Say callers name by volume level KTtsVolumeMin.             
-            volume = KTtsVolumeMin;
-                
-            iTtsPlayer->Play(
-                ConvertRingingType( EProfileRingingTypeRingingOnce ),
-                volume,
-                iTtsToneToBePlayed );
-            }
-        else
-            {
-            //Checks the case that ringingtone is very quiet. Then do not play
-            //TTS too loud
-            volume = iTtsVolume < KTtsVolumeMin ? KTtsVolumeMin : KTtsVolumeAscendingRepeat;     
-                           
-            //We are saying callers name for the second time in ascending mode.
-            //Say callers name by volume level KTtsVolumeAscendingRepeat and decrease current players volume
-            //to KPlayerVolumeAscendingRepeat. RampTime is zero
-            currPlayer->SetNewVolumeAndRamptime( KPlayerVolumeAscendingRepeat, 0 );
-            iTtsPlayer->Play(
-                ConvertRingingType( EProfileRingingTypeRingingOnce ),
-                volume,
-                iTtsToneToBePlayed );
-            }
-       
-        }
-    else //Normal ringing case.
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::DoHandleTtsDelayTimeout - play normal" ); 
-        currPlayer->SetNewVolumeAndRamptime( iTtsVolume-5, 0 );                       
-        iTtsPlayer->Play(
-            ConvertRingingType( EProfileRingingTypeRingingOnce ),
-            iTtsVolume,
-            iTtsToneToBePlayed );
-        }
-      
-     iTTsTimeOutCounter++;
-    }
-    
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::AddTtsPlaybackIfNeeded
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::AddTtsPlaybackIfNeeded( 
-        TProfileRingingType /*aRingingType*/ )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::AddTtsPlaybackIfNeeded()" );
-    if ( iTtsToneToBePlayed )   
-        {
-        iTtsDelayIndex = 0;
-        iTtsDelaysCount = KPhoneTtsDelaysCount;
-        }
-    }
 
 // -----------------------------------------------------------------------------
 // CPhoneRingingTonePlayerAO::SetVideoPlayer
@@ -1410,7 +446,7 @@
 void CPhoneRingingTonePlayerAO::SetVideoPlayer( 
     MPhoneVideoPlayer* aVideoPlayer )
     {
-    iVideoPlayer = aVideoPlayer;    
+    iVideoPlayer = aVideoPlayer;
     }
 
 // -----------------------------------------------------------------------------
@@ -1424,13 +460,13 @@
     TBool aPersonalTone )
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayVideoRingingTone()" );
-    
+
     __ASSERT_DEBUG( iVideoPlayer, Panic( EPhoneViewGeneralError ) );
-    
+
     iVolume = aVolume;
     iRingingType = aRingingType;
     TBool startTimer( ETrue );
-    
+
      // Extended security check
     if ( ExtendedSecurity() )
         {
@@ -1445,8 +481,8 @@
             }
         __PHONELOG( EBasic, 
                     EPhoneUIView, 
-                    "CPhoneRingingTonePlayerAO::HandleVideoPlayerError - ExtSecChk ok" );            
-            }
+                    "CPhoneRingingTonePlayerAO::HandleVideoPlayerError - ExtSecChk ok" );
+        }
  
     __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayVideoRingingTone - play" );
     switch( aRingingType )
@@ -1458,11 +494,11 @@
                 0,
                 iArbitraryVideoScaling,
                 this );
-            PlaySilentTone(); // To start vibra, video may fail.
+            iToneServer.PlaySilentTone(); // To start vibra, video may fail.
             iVolume = 0; // for repeat
             startTimer = EFalse; // no need for fallback
             break;
-        
+
         case EProfileRingingTypeBeepOnce:
             iVideoPlayer->PlayVideoRingTone( 
                 aRingingTone.FileName(),
@@ -1481,7 +517,7 @@
                 iVolume,
                 iArbitraryVideoScaling,
                 this );
-            break;                
+            break;
         }
 
     if ( aPersonalTone )
@@ -1498,7 +534,7 @@
         // Start timer to guard video opening
         iTimer->After( KPhoneMaxRingingWaiting, this );
         }
-    
+
     }
 
 // -----------------------------------------------------------------------------
@@ -1516,9 +552,9 @@
         __PHONELOG1( EBasic, 
                      EPhoneUIView, 
                      "CPhoneRingingTonePlayerAO::HandleVideoPlayerError - error (%d)",
-                     aError );        
+                     aError );
         }
-  
+
     // cancel guarding timer
     iTimer->Cancel();
 
@@ -1531,7 +567,7 @@
         if ( iAudioVideoRingingTone &&
              !iAudioVideoRingingTone->IsVideoRingingTone() )
             {
-            PlayAudioRingTone( iVolume, iRingingType );
+            iToneServer.PlayAudioRingTone( iVolume, iRingingType );
             }
         else // audio/video tone is video
             {
@@ -1553,10 +589,10 @@
 void CPhoneRingingTonePlayerAO::HandleVideoPlayerInitComplete()
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::HandleVideoPlayerInitComplete()" );
-    
+
     // cancel guarding timer
     iTimer->Cancel();
-    
+
     }
 
 // -----------------------------------------------------------------------------
@@ -1574,8 +610,8 @@
 //
 void CPhoneRingingTonePlayerAO::PlayDefaultVideoAsync()
     {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayDefaultVideoAsync()" );    
-     
+    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::PlayDefaultVideoAsync()" );
+
     Cancel();
 
     iState = EPlayingDefaultVideo; 
@@ -1588,129 +624,13 @@
 // -----------------------------------------------------------------------------
 // CPhoneRingingTonePlayerAO::ExtendedSecurity
 // -----------------------------------------------------------------------------
-//    
+//
 TBool CPhoneRingingTonePlayerAO::ExtendedSecurity() const
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::ExtendedSecurity()" );
-    return iExtSecNeeded;        
+    return iExtSecNeeded;
     }
 
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::SolveNewVolumeAndRamptime
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::SolveNewVolumeAndRamptime( TTtsStatus aStatus )
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::SolveNewVolumeAndRamptime()" );
-
-    CPhoneAudioPlayer* currPlayer = NULL;
-    currPlayer = GetCurrentlyActiveAudioPlayerWithTTs();
-    if ( !currPlayer )
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::SolveNewVolumeAndRamptime - null current player" );
-        return;
-        }
-    TInt ramptime( 0 );
-    //Here is handled the cases when Callers name is said. Sequence is:
-    //3 sec. tone + name + 4 sec. tone + name +the tone until the end. 
-    switch ( aStatus )
-        {
-        case ESaidOnce:
-            if ( iTtsRingingType == EProfileRingingTypeAscending )
-                {
-                //The ramptime could be ( 4 )* KPhoneTtsAscendingStep but now
-                //we are setting this to 0 because when Say callers name is said
-                //for first time: play ringing tone on level 3 for four secs.
-                ramptime = 0;
-                __PHONELOG1( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::SolveNewVolumeAndRamptime - said once ascending - ramptime(%d)",
-                    ramptime ); 
-                currPlayer->SetNewVolumeAndRamptime( KPlayerVolumeAscendingRepeat, ramptime );
-                }
-            else
-                {
-                 //Normal ringingtone case. Adjust volume back to profile level. 
-                __PHONELOG1( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::SolveNewVolumeAndRamptime - said once normal - ramptime(%d)",
-                    ramptime ); 
-                currPlayer->SetNewVolumeAndRamptime( iTtsVolume, 0 );    
-                }
-            break;
-        
-        case ESaidTwice:
-            if ( iTtsRingingType == EProfileRingingTypeAscending )
-                {
-                TInt vol = iTtsVolume;
-                if ( vol > KPlayerVolumeAscendingRepeat )
-                    {
-                    vol = vol - KTtsVolumeAscendingDecrease;
-                    }
-                          
-                //TTS playing complete for second time. increase tone player volume.
-                ramptime = ( vol )*KPhoneTtsAscendingStep;
-                __PHONELOG1( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::SolveNewVolumeAndRamptime - said twice ascending - ramptime(%d)",
-                    ramptime ); 
-                currPlayer->SetNewVolumeAndRamptime( iTtsVolume, ramptime );
-                }
-            else
-                {
-                 //Normal ringingtone case. Adjust volume back to profile level. 
-                __PHONELOG1( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::SolveNewVolumeAndRamptime - said twice normal - ramptime(%d)",
-                    ramptime ); 
-                currPlayer->SetNewVolumeAndRamptime( iTtsVolume, 0 );
-                }
-            break;
-        
-        default:
-            break;
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::GetCurrentlyActiveAudioPlayerWithTTs
-// -----------------------------------------------------------------------------
-//    
-CPhoneAudioPlayer* 
-CPhoneRingingTonePlayerAO::GetCurrentlyActiveAudioPlayerWithTTs()
-    {    
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::GetCurrentlyActiveAudioPlayerWithTTs()" );
-
-    if( iAudioPlayer )
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::GetCurrentlyActiveAudioPlayerWithTTs - audio player" ); 
-        return iAudioPlayer;         
-        }
-    else if ( iDefaultPlayer )
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::GetCurrentlyActiveAudioPlayerWithTTs - default player" ); 
-        return iDefaultPlayer;     
-        }
-    else if( iBackupPlayer )
-        {
-        __PHONELOG( EBasic, EPhoneUIView, "CPhoneRingingTonePlayerAO::GetCurrentlyActiveAudioPlayerWithTTs - backup player" ); 
-        return iBackupPlayer;
-        }
-    else
-        {
-        return NULL;
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::ReStartRingingTonePlayer
-// -----------------------------------------------------------------------------
-//      
-void CPhoneRingingTonePlayerAO::ReStartRingingTonePlayer()
-    {
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::ReStartRingingTonePlayer()" );
-
-    //First get currently active player which plays among TTS player.
-    CPhoneAudioPlayer* currPlayer = NULL;
-    currPlayer = GetCurrentlyActiveAudioPlayerWithTTs();   
-    if ( currPlayer )
-        {
-        currPlayer->ReStartPlaying();
-        }      
-    }
 
 // -----------------------------------------------------------------------------
 // CPhoneRingingTonePlayerAO::CheckAndHandleToneSizeLimit
@@ -1720,9 +640,9 @@
      CPhoneRingingTone* aRingingTone )
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::CheckAndHandleToneSizeLimit()" );
-    
+
     TBool bValidSize = ETrue;
- 
+
     // If user has somehow managed to get a too large file as ringing tone,
     // play default tone instead.
     if ( iToneFileSizeLimitKB )
@@ -1730,14 +650,14 @@
         if ( CheckToneFileSize( aRingingTone->FileName(), iToneFileSizeLimitKB) != KErrNone )
             {
             bValidSize = EFalse;
-            }            
+            }
         }
     __PHONELOG1( 
         EBasic,
         EPhoneUIView, 
         "CPhoneRingingTonePlayerAO::CheckAndHandleToneSizeLimit - bValidSize(%d)",
         bValidSize);
-        
+
     return bValidSize;
     }
 
@@ -1748,29 +668,29 @@
 TInt CPhoneRingingTonePlayerAO::CheckToneFileSize( const TDesC& aFile, TInt aSizeLimitKB )
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::CheckToneFileSize()" );
-    
+
     // Get file size
     TInt size = 0;
     TInt error = KErrNone;
-    RFs& fs = CCoeEnv::Static()->FsSession();       
+    RFs& fs = CCoeEnv::Static()->FsSession();
     TEntry entry;
     if (KErrNone == fs.Entry( aFile, entry ))
-		{
-		size = entry.iSize;
-		}    
-        
+        {
+        size = entry.iSize;
+        }
+
     // Check
     aSizeLimitKB *= Kkilo;
     if ( aSizeLimitKB  &&  size > aSizeLimitKB )
         {
         error = KErrTooBig;
         }
-    
+
     __PHONELOG1( 
         EBasic,
         EPhoneUIView, 
         "CPhoneRingingTonePlayerAO::CheckToneFileSize - size (%d)",
-        size );    
+        size );
     return error;
     }
 
@@ -1782,132 +702,29 @@
 void CPhoneRingingTonePlayerAO::GetMaxToneFileSizeL( TInt& aMaxSizeKB ) const
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::GetMaxToneFileSizeL()" );
-    
+
     const TInt error = CPhoneCenRepProxy::Instance()->GetInt( 
             KCRUidProfileEngine,
             KProEngRingingToneMaxSize,
             aMaxSizeKB );
-   
-   	if ( error != KErrNone )
-    	{
+
+    if ( error != KErrNone )
+        {
         aMaxSizeKB = 0;
-    	}
-	if ( aMaxSizeKB < 0 )
-	    {
-	     aMaxSizeKB = 0;
-	    }
-  
+        }
+    if ( aMaxSizeKB < 0 )
+        {
+        aMaxSizeKB = 0;
+        }
+
     __PHONELOG2( 
         EBasic,
         EPhoneUIView, 
         "CPhoneRingingTonePlayerAO::GetMaxToneFileSizeL - error (%d), aMaxSizeKB(%d)",
         error,
-        aMaxSizeKB );	    
+        aMaxSizeKB );
     }
 
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::ActiveAudioPlayer
-// -----------------------------------------------------------------------------
-//
-CPhoneAudioPlayer* CPhoneRingingTonePlayerAO::ActiveAudioPlayer()
-	{
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::ActiveAudioPlayer()" );
-
-    switch( iTonePlayingStatus )
-        {
-        case EAudioTonePlaying:
-            if( iAudioPlayer )
-                {
-				return iAudioPlayer;
-                }
-            break;
-            
-        case EDefaultTonePlaying:
-            if ( iDefaultPlayer )
-                {
-				return iDefaultPlayer;
-                }
-            break;
-            
-        case EBeepOnce:
-            if( iBeepOncePlayer )
-                {
-				return iBeepOncePlayer;
-                }
-            break;
-            
-        case EBackupTonePlaying:
-            if( iBackupPlayer )
-                {
-                return iBackupPlayer;
-                }
-            break;
-            
-        case ESilentTonePlaying:
-            if( iSilentPlayer )
-                {
-                return iSilentPlayer;
-                }
-            break;
-            
-        case EUnsecureVoIPTonePlaying:
-            if( iUnsecureVoIPTonePlayer )
-                {
-                return iUnsecureVoIPTonePlayer;
-                }
-            break;
-            
-        case EVideoTonePlaying: // video ringing tone
-        case EPersonalVideoTonePlaying:
-        case ESilentVideoTonePlaying:
-            if ( iBeepOncePlayer )
-                {
-                return iBeepOncePlayer;                    
-                }    
-            else if ( iSilentPlayer )
-                {
-                return iSilentPlayer;                    
-                }    
-            break;
-            
-        default:
-            break;
-        }
-
-	return NULL;		
-	}
-
-// -----------------------------------------------------------------------------
-// CPhoneRingingTonePlayerAO::DoMuteRingingTone
-// -----------------------------------------------------------------------------
-//
-void CPhoneRingingTonePlayerAO::DoMuteRingingTone()
-	{
-    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::DoMuteRingingTone()" );
-	
-	switch( iTonePlayingStatus )
-		{
-        case EVideoTonePlaying: // video ringing tone, fall through
-        case EPersonalVideoTonePlaying: // fall through
-        case ESilentVideoTonePlaying:
-            if ( iVideoPlayer )
-	            {
-                iVideoPlayer->MuteVideoRingTone();
-                return;	            	
-	            }
-	        break;
-	        
-	    default:
-	    	break;
-		}
-	
-	CPhoneAudioPlayer* activePlayer = ActiveAudioPlayer();
-	if( activePlayer )
-		{
-		activePlayer->MutePlaying();
-		}
-	}
-
 // -----------------------------------------------------------
 // CPhoneRingingTonePlayerAO::HandleCenRepChangeL
 // -----------------------------------------------------------
@@ -1917,20 +734,20 @@
     const TUint /*aId*/ )
     {
     __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneRingingTonePlayerAO::HandleCenRepChangeL()");
-    
+
     if ( aUid == KCRUidDRMHelperServer )
         {
         TBuf<256> tempBuf16( KNullDesC );
-        
+
         User::LeaveIfError( CPhoneCenRepProxy::Instance()->GetString(
             KCRUidDRMHelperServer,
             KDRMHelperServerNotificationPassive,
-            tempBuf16 ) );         
-       
+            tempBuf16 ) );
+
         const TBool idleIsTopApp = CPhonePubSubProxy::Instance()->Value(
             KPSUidAiInformation, KActiveIdleState ) == EPSAiForeground;
-       
-        // Quick validity check and    
+
+        // Quick validity check and
         // The first Tuint8 is the times the content has been informed.
         // Note should not shown until Idle.
         if ( idleIsTopApp && tempBuf16.Length() >= KPhoneMinDRMTextLength )
@@ -1938,28 +755,28 @@
             TBuf8<256> tempBuf8;
             TPtrC8 ptr((TUint8*)tempBuf16.Ptr(), tempBuf16.Size());
             HBufC8* buf8 = HBufC8::NewLC( 256 );
-            buf8->Des().Copy(ptr);  
-    	    // Extract URI etc. 
-    	    // buf8 format:
-    	    //<TUint8 aTimes><TUint8 aExpirationMark>
-    	    //<TUint8 aPermissionType>
-    	    //<TUint8 aAutomatedContentType><TDesC8 aContentID>
-     	    TInt8 count = (TInt8)(*(buf8->Ptr())); 
-    	    TChar mark = (TChar)(*(buf8->Ptr()+1));
-    	    TInt8 permtype = (TChar)(*(buf8->Ptr()+2));
-    	    TInt8 automcontenttype = (TChar)(*(buf8->Ptr()+3)); 
-    	    TBuf8<256> curi = buf8->Right( buf8->Length()-4);
-    		
-    		if (curi.Ptr()[curi.Size()-1] == 0)
-    		    {
-    		    // The last character in the descriptor is 0, which means
-    		    // that the original 16-bit desc was padded so
-    		    // remove the last char...
-    		    curi.SetLength(curi.Size()-1);
-    		    }
-    		        
-            // Create DRM helper.     
-            CDRMHelper* drmHelper = CDRMHelper::NewLC();            
+            buf8->Des().Copy(ptr);
+            // Extract URI etc. 
+            // buf8 format:
+            //<TUint8 aTimes><TUint8 aExpirationMark>
+            //<TUint8 aPermissionType>
+            //<TUint8 aAutomatedContentType><TDesC8 aContentID>
+            TInt8 count = (TInt8)(*(buf8->Ptr())); 
+            TChar mark = (TChar)(*(buf8->Ptr()+1));
+            TInt8 permtype = (TChar)(*(buf8->Ptr()+2));
+            TInt8 automcontenttype = (TChar)(*(buf8->Ptr()+3)); 
+            TBuf8<256> curi = buf8->Right( buf8->Length()-4);
+
+            if ( curi.Ptr()[curi.Size()-1] == 0 )
+                {
+                // The last character in the descriptor is 0, which means
+                // that the original 16-bit desc was padded so
+                // remove the last char...
+                curi.SetLength(curi.Size()-1);
+                }
+
+            // Create DRM helper. 
+            CDRMHelper* drmHelper = CDRMHelper::NewLC();
             // Show notification.
             drmHelper->SetAutomatedType( (CDRMHelper::TDRMHelperAutomatedType)automcontenttype );
             TInt error = drmHelper->CheckRightsAmountL( curi );
@@ -1967,11 +784,11 @@
             __PHONELOG1( EBasic, EPhoneUIView, 
                 "CPhoneRingingTonePlayerAO::HandleCenRepChangeL > CheckRightsAmountL, error: %d"
                 , error );
-                           
+
             CleanupStack::PopAndDestroy( drmHelper ); 
             CleanupStack::PopAndDestroy( buf8 ); 
             } 
         }
     }
-    
-//  End of File  
+
+//  End of File
--- a/phoneapp/phoneuiview/src/cphoneviewcontroller.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuiview/src/cphoneviewcontroller.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -137,8 +137,8 @@
 #include <easydialingcommands.hrh>
 
 // Kastor effect IDs, aknskincontent/101f84b9.sel
-const TInt KTouchDialerOpenEffect  = 1505;
-const TInt KTouchDialerCloseEffect = 1506;
+const TInt KTouchDialerOpenEffect  = 3;
+const TInt KTouchDialerCloseEffect = 5;
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -500,10 +500,6 @@
             iKeyLock.EnableKeyLock();
             break;
 
-        case EPhoneViewEnableKeyLockWithoutNote:
-            iKeyLock.EnableWithoutNote();
-            break;
-            
         case EPhoneViewDisableKeyLockWithoutNote:
             iKeyLock.DisableWithoutNote();
             break;
@@ -633,12 +629,6 @@
             }
             break;  
 
-        case EPhoneViewDisableKeyLock:
-            {
-            DisableKeyLock();
-            }
-            break;
-
         case EPhoneViewLaunchMultimediaSharing:
             {
             LaunchMultimediaSharingL();
@@ -1434,17 +1424,17 @@
                 TBool idleInFore = ForegroundApplicationWindowGroupId() ==  IdleWindowGroupId() ?
                         ETrue : EFalse;
                 
-                if ( isForeground && // Newer run effect if not at front
+                if ( ( isForeground && // Newer run effect if not at front
                      ( ( type == EPhoneTransEffectDialerCreate && !iDialerActive ) ||
                        ( type == EPhoneTransEffectDialerOpen && !iDialerActive &&
-                         iBubbleWrapper->IsNumberEntryUsed() ) ||
+                         iBubbleWrapper->IsNumberEntryUsed() )) ||
                        ( type == EPhoneTransEffectDialerClose && iDialerActive ) ) )
                     {
                     HandleTransitionEffect( type );
                     }
-                // In case transition is from idle to dialer show transition effects as well.
-                else if ( idleInFore && !iDialerActive &&
-                          type == EPhoneTransEffectDialerCreate )
+                // In case transition is from idle to dialer show transition effects as well.                 
+                 else if ( idleInFore && !iDialerActive &&
+                          type == EPhoneTransEffectDialerOpen )
                     {
                     HandleTransitionEffect( type );
                     }
@@ -1630,12 +1620,6 @@
           }
           break;
 
-        case EPhoneViewIsKeyLockEnabled:
-            viewResponse = IsKeyLockEnabled() ?
-                EPhoneViewResponseSuccess :
-                EPhoneViewResponseFailed;
-            break;          
-
     // Dialer specific commands start
 
     // Dialer handles these commands.
@@ -2748,30 +2732,6 @@
         booleanParam->Boolean() );
     }
 
-// ---------------------------------------------------------
-// CPhoneViewController::IsKeyLockEnabled
-// ---------------------------------------------------------
-//
-TBool CPhoneViewController::IsKeyLockEnabled()
-    {
-    TBool keylock;
-    keylock = iKeyLock.IsKeyLockEnabled();
-    __PHONELOG1( EBasic, EPhoneUIView,
-        "CPhoneViewController::IsKeyLockEnabled(%d)", keylock );
-    return keylock;
-    }
-
-// ---------------------------------------------------------
-// CPhoneViewController::DisableKeyLock
-// ---------------------------------------------------------
-//
-void CPhoneViewController::DisableKeyLock()
-    {
-    __PHONELOG( EBasic, EPhoneUIView,
-        "CPhoneViewController::DisableKeyLock()");
-    return iKeyLock.DisableWithoutNote();
-    }
-
 // CPhoneViewController::CancelAllNotications
 // ---------------------------------------------------------------------------
 //
@@ -3700,10 +3660,7 @@
              currentLayout == R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL )
             {
             SwapEmptyIndicatorPaneInSecureStateL( EFalse );
-
-            //  do Pop for navipane
-            iAudioController->DeactivateVolumeControl();
-
+            
             if ( !Layout_Meta_Data::IsLandscapeOrientation() )
                 {
                 iStatusPane->StatusPane().SwitchLayoutL
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiview/src/phoneringingtoneclient.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,253 @@
+/*
+* Copyright (c) 2002-2005,2007 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:  Client interface of the phone ringing tone server.
+*
+*/
+
+
+// INCLUDE FILES
+#include <e32base.h>
+#include <e32std.h>
+#include <e32svr.h>
+
+#include "phoneringingtoneclient.h"
+#include "phoneringingtonesrv.h"
+#include "phoneringingtonesrv.hrh"
+#include "phoneuiviewtrace.h"
+
+// LOCAL FUNCTION PROTOTYPES
+static TInt StartServer();
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::RPhoneRingingTonePlayer
+// -----------------------------------------------------------------------------
+//
+RPhoneRingingTonePlayer::RPhoneRingingTonePlayer() : RSessionBase()
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::~RPhoneRingingTonePlayer
+// -----------------------------------------------------------------------------
+//
+RPhoneRingingTonePlayer::~RPhoneRingingTonePlayer()
+    {
+    Close();
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::Connect
+// -----------------------------------------------------------------------------
+//
+TInt RPhoneRingingTonePlayer::Connect()
+    {
+    PHONEUIVIEW_PRINT("RPhoneRingingTonePlayer::Connect <");
+    TInt retries = 3;
+    TInt err = KErrNone;
+
+    while(retries--)
+        {
+        err = CreateSession( KRingingToneServerName, 
+            TVersion( KRingingToneSrvVersionMajor,KRingingToneSrvVersionMinor,KRingingToneSrvVersionBuild ) );
+
+        PHONEUIVIEW_PRINTF("RPhoneRingingTonePlayer::Connect: CreateSession err %d", err);
+        if ( ( err != KErrNotFound ) && ( err != KErrServerTerminated ) )
+            {
+            break;
+            }
+
+        err = StartServer();
+
+        PHONEUIVIEW_PRINTF("RPhoneRingingTonePlayer::Connect: StartServer err %d", err);
+        if ( ( err != KErrNone ) && ( err != KErrAlreadyExists ) )
+            {
+            break;
+            }
+        }
+
+    PHONEUIVIEW_PRINTF("RPhoneRingingTonePlayer::Connect, ret %d >", err);
+    return err;
+    }
+
+
+// -----------------------------------------------------------------------------
+// StartServer
+// -----------------------------------------------------------------------------
+//
+TInt StartServer()
+{
+    PHONEUIVIEW_PRINT("RPhoneRingingTonePlayer - StartServer <");
+
+    // Form thread name
+    TTime time;
+    time.UniversalTime();
+
+    TFullName threadName;
+    threadName.Format( _L("PhoneRingingToneThread%Ld"), time.Int64() );
+
+    // Create thread
+    RThread thread;
+    TInt err = thread.Create( threadName, CPhoneRingingToneServer::ThreadEntryFunc, 0x8000, NULL, NULL );
+    if ( err != KErrNone )
+        {
+        return err;
+        }
+
+    PHONEUIVIEW_PRINT("RPhoneRingingTonePlayer - StartServer: thread created");
+
+    // Bump thread priority
+    thread.SetPriority( EPriorityAbsoluteHigh );
+
+    // Rendezvous with the thread
+    TRequestStatus status;
+    thread.Rendezvous( status );
+    if ( status != KRequestPending )
+        {
+        thread.Kill( 0 );
+        }
+    else
+        {
+        thread.Resume();
+        }
+
+    PHONEUIVIEW_PRINT("RPhoneRingingTonePlayer - StartServer: waiting for rendezvous");
+
+    // Wait for thread start or death
+    User::WaitForRequest( status );
+    thread.Close();
+
+    PHONEUIVIEW_PRINTF("RPhoneRingingTonePlayer - StartServer: rendezvous: %d", status.Int());
+
+    PHONEUIVIEW_PRINT("RPhoneRingingTonePlayer - StartServer >");
+    return status.Int();
+}
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::SetExtendedSecurityNeeded
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::SetExtendedSecurityNeeded( TBool aNeeded )
+    {
+    SendReceive( ESetExtendedSecurityNeeded, TIpcArgs( aNeeded ) );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::SetToneFileSizeLimit
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::SetToneFileSizeLimit( TInt aLimit )
+    {
+    SendReceive( ESetToneFileSizeLimit, TIpcArgs( aLimit ) );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::SetRingingToneL
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::SetRingingToneL( const TDesC& aFilename )
+    {
+    User::LeaveIfError( SendReceive( ESetAudioRingingTone, TIpcArgs( &aFilename ) ) );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::SetDefaultRingingToneL
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::SetDefaultRingingToneL( const TDesC& aFilename )
+    {
+    User::LeaveIfError( SendReceive( ESetDefaultRingingTone, TIpcArgs( &aFilename ) ) );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::PlayAudioRingTone
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::PlayAudioRingTone( TInt aVolume, TProfileRingingType aRingingType )
+    {
+    SendReceive( EPlayAudioRingTone, TIpcArgs( aVolume, aRingingType ) );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::PlayTtsTone
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::PlayTtsTone( const TDesC& aTextToSay, TInt aVolume, TProfileRingingType aRingingType )
+    {
+    SendReceive( EPlayTtsTone, TIpcArgs( &aTextToSay, aVolume, aRingingType ) );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::PlayDefaultTone
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::PlayDefaultTone( TInt aVolume, TProfileRingingType aRingingType )
+    {
+    SendReceive( EPlayDefaultTone, TIpcArgs( aVolume, aRingingType ) );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::PlayBackupTone
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::PlayBackupTone( TInt aVolume, TProfileRingingType aRingingType )
+    {
+    SendReceive( EPlayBackupTone, TIpcArgs( aVolume, aRingingType ) );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::PlaySilentTone
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::PlaySilentTone()
+    {
+    SendReceive( EPlaySilentTone );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::BeepOnce
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::BeepOnce( TInt aVolume )
+    {
+    SendReceive( EBeepOnce, TIpcArgs( aVolume ) );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::PlayUnsecureVoIPTone
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::PlayUnsecureVoIPTone()
+    {
+    SendReceive( EPlayUnsecureVoIPTone );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::MuteRingingTone
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::MuteRingingTone()
+    {
+    SendReceive( EMuteRingingTone );
+    }
+
+// -----------------------------------------------------------------------------
+// RPhoneRingingTonePlayer::StopPlaying
+// -----------------------------------------------------------------------------
+//
+void RPhoneRingingTonePlayer::StopPlaying()
+    {
+    SendReceive( EStopPlaying );
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiview/src/phoneringingtonesrv.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,384 @@
+/*
+* Copyright (c) 2002-2005,2007 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:  Ringing tone server.
+*
+*/
+
+
+// INCLUDE FILES
+#include <e32base.h>
+#include <e32svr.h>
+
+#include "phoneringingtonesrv.h"
+#include "phoneringingtonesrvsession.h"
+#include "phoneringingtonesrvplayerao.h"
+#include "phoneuiviewtrace.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::CPhoneRingingToneServer
+// -----------------------------------------------------------------------------
+//
+CPhoneRingingToneServer::CPhoneRingingToneServer()
+    : CServer2( EPriorityHigh )
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::~CPhoneRingingToneServer
+// -----------------------------------------------------------------------------
+//
+CPhoneRingingToneServer::~CPhoneRingingToneServer()
+    {
+    delete iPlayer; 
+    iPlayer = 0;
+    iFs.Close();
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::NewLC
+// -----------------------------------------------------------------------------
+//
+CPhoneRingingToneServer* CPhoneRingingToneServer::NewLC()
+    {
+    CPhoneRingingToneServer* self = new (ELeave) CPhoneRingingToneServer;
+
+    CleanupStack::PushL(self);
+    self->ConstructL();
+
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::ConstructL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::ConstructL()
+    {
+    User::LeaveIfError( iFs.Connect() );
+
+    // Allocate player
+    iPlayer = CPhoneRingingToneSrvPlayerAO::NewL( iFs );
+
+    // Try to start the server
+    StartL( KRingingToneServerName );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::NewSessionL
+// -----------------------------------------------------------------------------
+//
+CSession2* CPhoneRingingToneServer::NewSessionL( const TVersion& /*aVersion*/,  const RMessage2& /*aMessage*/ ) const
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServerSession::NewSessionL" );
+
+    return CPhoneRingingToneServerSession::NewL( *const_cast<CPhoneRingingToneServer*>(this) );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::IncrementSessions
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::IncrementSessions()
+    {
+    iSessionCount++;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::DecrementSessions
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::DecrementSessions()
+    {
+    if ( --iSessionCount <= 0 )
+        {
+        CActiveScheduler::Stop();
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::ThreadEntryFunc
+// -----------------------------------------------------------------------------
+//
+TInt CPhoneRingingToneServer::ThreadEntryFunc( TAny* /*aPtr*/ )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::ThreadEntryFunc <" );
+    // Allocate cleanup stack, active scheduler and server
+    CTrapCleanup* cleanup = CTrapCleanup::New();
+    CActiveScheduler* scheduler = new CActiveScheduler;
+
+    // Check that all allocations were ok
+    if ( !cleanup || !scheduler )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::ThreadEntryFunc: OOM" );
+        // Out of memory
+        delete scheduler;
+        delete cleanup;
+
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::ThreadEntryFunc >" );
+        return KErrNoMemory;
+        }
+
+    // Install active scheduler
+    CActiveScheduler::Install( scheduler );
+
+    // Run the server
+    TRAPD( err, CPhoneRingingToneServer::RunServerL() );
+
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneServer::ThreadEntryFunc: RunServerL err %d", err );
+
+    // Uninstall active scheduler
+    CActiveScheduler::Install( NULL );
+
+    // Cleanup
+    delete scheduler;
+    delete cleanup;
+
+    return err;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::RunServerL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::RunServerL()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::RunServerL <" );
+
+    // Allocate server
+    CPhoneRingingToneServer* server = CPhoneRingingToneServer::NewLC();
+
+    // Notify that we're running
+    RThread::Rendezvous( KErrNone );
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::RunServerL: server is running!" );
+
+    // Start active scheduler
+    CActiveScheduler::Start();
+
+    CleanupStack::PopAndDestroy(); // server
+
+    // Won't stop until all sessions to the server are closed (last one calls CActiveScheduler::Stop)
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::RunServerL >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::SetExtendedSecurityNeeded
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::SetExtendedSecurityNeeded( TBool aNeeded )
+    {
+    iPlayer->SetExtendedSecurityNeeded( aNeeded );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::SetToneFileSizeLimit
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::SetToneFileSizeLimit( TInt aLimit )
+    {
+    iPlayer->SetToneFileSizeLimit( aLimit );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::SetRingingToneL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::SetRingingToneL( const RMessage2& aMessage )
+    {
+    // Read filename from the message
+    TFileName filename;
+    TInt len = aMessage.GetDesLength( 0 );
+
+    aMessage.ReadL( 0, filename );
+
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneServer::SetRingingToneL: %S", &filename );
+
+    // Give the ringing tone to the player
+    iPlayer->SetRingingToneL( filename );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::SetDefaultRingingToneL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::SetDefaultRingingToneL( const RMessage2& aMessage )
+    {
+    // Read filename from the message
+    TFileName filename;
+    TInt len = aMessage.GetDesLength( 0 );
+
+    aMessage.ReadL( 0, filename );
+
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneServer::SetDefaultRingingToneL: %S", &filename );
+
+    // Give the default tone to the player
+    iPlayer->SetDefaultRingingToneL( filename );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::PlayAudioRingTone
+// -----------------------------------------------------------------------------
+//
+TBool CPhoneRingingToneServer::PlayAudioRingTone( const RMessage2& aMessage )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::PlayAudioRingTone <" );
+
+    // Read the parameters
+    TInt volume = aMessage.Int0();
+    TProfileRingingType ringingType = (TProfileRingingType)aMessage.Int1();
+
+    PHONEUIVIEW_PRINTF2(
+            "CPhoneRingingToneServer::PlayAudioRingTone: volume=%d, ringingType=%d", 
+            volume, ringingType);
+
+    TBool ret = iPlayer->PlayAudioRingTone( volume, ringingType, aMessage );
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::PlayAudioRingTone >" );
+
+    return ret;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::PlayTtsTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::PlayTtsTone( const RMessage2& aMessage )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::PlayTtsTone <" );
+
+    // Read the parameters
+    TInt volume = aMessage.Int1();
+    TProfileRingingType ringingType = (TProfileRingingType)aMessage.Int2();
+
+    TInt ttsLen = aMessage.GetDesLength( 0 );
+    HBufC* textToSay = HBufC::New( ttsLen );
+    if ( !textToSay )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::PlayTtsTone: OOM!" );
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::PlayTtsTone >" );
+        return;
+        }
+
+    TPtr ptr( textToSay->Des() );
+
+    TInt err = aMessage.Read( 0, ptr );
+    if ( err != KErrNone )
+        {
+        PHONEUIVIEW_PRINTF( "CPhoneRingingToneServer::PlayTtsTone: read err %d", err );
+        delete textToSay;
+        return;
+        }
+
+    PHONEUIVIEW_PRINTF3(
+            "CPhoneRingingToneServer::PlayTtsTone: text=%S, volume=%d, ringingType=%d", 
+            &(*textToSay), volume, ringingType );
+
+    iPlayer->PlayTtsTone( *textToSay, volume, ringingType );
+
+    // Cleanup
+    delete textToSay;
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::PlayTtsTone >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::PlayDefaultTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::PlayDefaultTone( const RMessage2& aMessage )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::PlayDefaultTone <" );
+
+    // Read the parameters
+    TInt volume = aMessage.Int0();
+    TProfileRingingType ringingType = (TProfileRingingType)aMessage.Int1();
+
+    PHONEUIVIEW_PRINTF2(
+        "CPhoneRingingToneServer::PlayDefaultTone: volume=%d, ringingType=%d", 
+        volume, ringingType );
+
+    iPlayer->PlayDefaultTone( volume, ringingType );
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::PlayDefaultTone >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::PlayBackupTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::PlayBackupTone( const RMessage2& aMessage )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::PlayBackupTone <" );
+
+    // Read the parameters
+    TInt volume = aMessage.Int0();
+    TProfileRingingType ringingType = (TProfileRingingType)aMessage.Int1();
+
+    PHONEUIVIEW_PRINTF2(
+        "CPhoneRingingToneServer::PlayBackupTone: volume=%d, ringingType=%d", 
+        volume, ringingType );
+
+    iPlayer->PlayBackupTone( volume, ringingType );
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServer::PlayBackupTone >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::PlaySilentTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::PlaySilentTone()
+    {
+    iPlayer->PlaySilentTone();
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::BeepOnce
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::BeepOnce( const RMessage2& aMessage )
+    {
+    iPlayer->BeepOnce( aMessage.Int0() );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::PlayUnsecureVoIPTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::PlayUnsecureVoIPTone()
+    {
+    iPlayer->PlayUnsecureVoIPTone();
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::MuteRingingTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::MuteRingingTone()
+    {
+    iPlayer->MuteRingingTone();
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServer::StopPlaying
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServer::StopPlaying()
+    {
+    iPlayer->StopPlaying();
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiview/src/phoneringingtonesrvplayerao.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,1564 @@
+/*
+* Copyright (c) 2002-2005,2007 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:  Active object of the ringing tone player.
+*
+*/
+
+
+// INCLUDE FILES
+#include <e32base.h>
+#include <f32file.h>
+#include <Utility.h>
+#include <AudioPreference.h>
+
+#include "PhoneUI.pan"
+#include "cphoneringingtone.h"
+#include "cphoneaudioplayer.h"
+#include "cphonetimer.h"
+#include "phoneringingtonesrvplayerao.h"
+#include "phoneringingtonesrv.h"
+#include "phoneconstants.h"
+#include "phoneuiviewtrace.h"
+
+#ifdef __WINS__
+#include <data_caging_path_literals.hrh>
+#endif
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::NewL
+// -----------------------------------------------------------------------------
+//
+CPhoneRingingToneSrvPlayerAO* CPhoneRingingToneSrvPlayerAO::NewL( RFs& aFs )
+    {
+    CPhoneRingingToneSrvPlayerAO* self =
+        new ( ELeave ) CPhoneRingingToneSrvPlayerAO( aFs );
+
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::CPhoneRingingToneSrvPlayerAO
+// -----------------------------------------------------------------------------
+//
+CPhoneRingingToneSrvPlayerAO::CPhoneRingingToneSrvPlayerAO( RFs &aFs ) :
+    CActive( CActive::EPriorityStandard ),
+    iFs( aFs ),
+    iAsyncDeletePlayers( EPlayerCount )
+    {
+    CActiveScheduler::Add( this );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::ConstructL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::ConstructL()
+    {
+    for ( TInt i = EPlayerFirst; i <= EPlayerLast; i++ )
+        {
+        User::LeaveIfError(
+            iAsyncDeletePlayers.Append( NULL ) );
+        }
+
+    // Construct timer.
+    iTimer = CPhoneTimer::NewL();
+    iTtsDelayTimer = CPhoneTimer::NewL();
+
+    ConstructPlayers();
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::~CPhoneRingingToneSrvPlayerAO
+// -----------------------------------------------------------------------------
+//
+CPhoneRingingToneSrvPlayerAO::~CPhoneRingingToneSrvPlayerAO()
+    {
+    Cancel();
+
+    iAsyncDeletePlayers.ResetAndDestroy();
+    iAsyncDeletePlayers.Close();
+
+    CleanupPlayers();
+
+    delete iTimer;
+    delete iTtsDelayTimer;
+    delete iDefaultRingingTone;
+    delete iAudioVideoRingingTone;
+
+    if ( iClientMessage.Handle() )
+        {
+        iClientMessage.Complete( KErrNone );
+        }
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::PlayAudioRingTone
+// -----------------------------------------------------------------------------
+//
+TBool CPhoneRingingToneSrvPlayerAO::PlayAudioRingTone(
+    TInt aVolume,
+    TProfileRingingType aRingingType,
+    const RMessage2& aMessage )
+    {
+
+    TBool messageSaved = EFalse;
+    iTimer->Cancel();
+
+    // Release any old client (shouldn't happen)
+    if ( iClientMessage.Handle() )
+        {
+        iClientMessage.Complete( KErrNone );
+        }
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayAudioRingTone <" );
+    PHONEUIVIEW_PRINTF2(
+        "CPhoneRingingToneSrvPlayerAO::PlayAudioRingTone - aVolume(%d), aRingingType(%d)",
+        aVolume,
+        aRingingType );
+
+    if ( !iAudioVideoRingingTone ||
+         !CheckAndHandleToneSizeLimit( iAudioVideoRingingTone ) )
+        {
+        PlayDefaultTone( aVolume, aRingingType );
+        }
+    else if ( aRingingType == EProfileRingingTypeSilent )
+        {
+        PlaySilentTone();
+        }
+    else if ( aRingingType == EProfileRingingTypeBeepOnce )
+        {
+        BeepOnce( aVolume );
+        }
+    else
+        {
+        // Construct player for line 1.
+        if ( !iAudioPlayer )
+            {
+            iAudioPlayer = ConstructTonePlayer(
+                *iAudioVideoRingingTone,
+                EPlayerAudio );
+
+            if ( !iTimer->IsActive() )
+                {
+                PHONEUIVIEW_PRINT( "RING TONE FAILSAFE TIMER START!!" );
+                // Start timer, since the player is constructed.
+                iTimer->After( KPhoneMaxRingingWaiting, this );
+                }
+            }
+
+        // Start playing.
+        if ( !iAudioPlayer )
+            {
+            iTimer->Cancel();
+            PlayDefaultTone( aVolume, aRingingType );
+            }
+        else
+            {
+            PHONEUIVIEW_PRINT(
+                "CPhoneRingingToneSrvPlayerAO::PlayAudioRingTone - Start playing audio" );
+            iVolume = aVolume;
+            iRingingType = aRingingType;
+            AddTtsPlaybackIfNeeded( aRingingType );
+            iTonePlayingStatus = EAudioTonePlaying;
+
+            // Save the client message which will be completed after init/error/timeout
+            iClientMessage = aMessage;
+            messageSaved = ETrue;
+
+            iAudioPlayer->Play(
+                ConvertRingingType( aRingingType ),
+                aVolume,
+                iTtsToneToBePlayed );
+            }
+        }
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayAudioRingTone >" );
+
+    return messageSaved;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::BeepOnce
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::BeepOnce( TInt aVolume )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::BeepOnce <" );
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::BeepOnce - aVolume(%d)", aVolume );
+
+    if ( !iBeepOncePlayer )
+        {
+        ConstructSequencePlayer( EPlayerBeepOnce );
+        }
+
+    if ( iBeepOncePlayer )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::BeepOnce - Play" );
+        iTonePlayingStatus = EBeepOnce;
+        iBeepOncePlayer->Play( CPhoneAudioPlayer::ETypeRingingOnce,
+            aVolume, EFalse );
+        }
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::BeepOnce >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO,::PlaySilentTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::PlaySilentTone()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlaySilentTone <" );
+
+    if ( !iSilentPlayer )
+        {
+        ConstructSequencePlayer( EPlayerSilent );
+        }
+
+    __ASSERT_DEBUG( iSilentPlayer, Panic( EPhoneViewGeneralError ) );
+
+    if ( iSilentPlayer )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlaySilentTone - play" );
+        iTonePlayingStatus = ESilentTonePlaying;
+        iSilentPlayer->Play( CPhoneAudioPlayer::ETypeRinging, 0, EFalse );
+        }
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlaySilentTone >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::PlayUnsecureVoIPTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::PlayUnsecureVoIPTone()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayUnsecureVoIPTone <" );
+    if ( !iUnsecureVoIPTonePlayer )
+        {
+        ConstructSequencePlayer( EPlayerUnsecureVoIP );
+        }
+    __ASSERT_DEBUG( iUnsecureVoIPTonePlayer, Panic( EPhoneViewGeneralError ) );
+
+    if ( iUnsecureVoIPTonePlayer )
+        {
+        iTonePlayingStatus = EUnsecureVoIPTonePlaying;
+        iUnsecureVoIPTonePlayer->Play( CPhoneAudioPlayer::ETypeRingingOnce,
+            KPhoneDefaultVolume, EFalse );
+        }
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayUnsecureVoIPTone >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::MuteRingingTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::MuteRingingTone()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::MuteRingingTone <" );
+
+    CPhoneAudioPlayer* activePlayer = ActiveAudioPlayer();
+    if ( activePlayer )
+        {
+        activePlayer->MutePlaying();
+        }
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::MuteRingingTone >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::StopPlaying
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::StopPlaying()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::StopPlaying <" );
+
+    // Complete waiting client just in case
+    if ( iClientMessage.Handle() )
+        {
+        iClientMessage.Complete( KErrNone );
+        }
+
+    iTtsToneToBePlayed = EFalse;
+    iTTsTimeOutCounter = 0;
+    iTtsDelayTimer->Cancel();
+    if ( iTtsPlayer )
+        {
+        iTtsPlayer->StopPlaying();
+        delete iTtsPlayer;
+        iTtsPlayer = NULL;
+        }
+    iTimer->Cancel();
+
+    switch( iTonePlayingStatus )
+        {
+        case EAudioTonePlaying:
+            if ( iAudioPlayer )
+                {
+                // Commented stopping out, since with this, the screen is jammed
+                // when REComSession::FinalClose() is reached in
+                // CPhoneAudioPlayer's destructor.
+                // Audio player is stopped anyway in its destructor.
+                // Fixes EKKI-7WYG2G and JKAN-7XNGQU.
+                // iAudioPlayer->StopPlaying();
+                delete iAudioPlayer;
+                iAudioPlayer = NULL;
+                }
+            break;
+        case EDefaultTonePlaying:
+            if ( iDefaultPlayer )
+                {
+                iDefaultPlayer->StopPlaying();
+                delete iDefaultPlayer;
+                iDefaultPlayer = NULL;
+                }
+            break;
+        case EBeepOnce:
+            if ( iBeepOncePlayer )
+                {
+                iBeepOncePlayer->StopPlaying();
+                delete iBeepOncePlayer;
+                iBeepOncePlayer = NULL;
+                }
+            break;
+        case EBackupTonePlaying:
+            if ( iBackupPlayer )
+                {
+                iBackupPlayer->StopPlaying();
+                }
+            break;
+        case ESilentTonePlaying:
+            if ( iSilentPlayer )
+                {
+                iSilentPlayer->StopPlaying();
+                delete iSilentPlayer;
+                iSilentPlayer = NULL;
+                }
+            break;
+        case EUnsecureVoIPTonePlaying:
+            if ( iUnsecureVoIPTonePlayer )
+                {
+                iUnsecureVoIPTonePlayer->StopPlaying();
+                delete iUnsecureVoIPTonePlayer;
+                iUnsecureVoIPTonePlayer = NULL;
+                }
+            break;
+        case EIdle:
+            break;
+        default:
+            Panic( EPhoneViewCaseNotHandled );
+            break;
+        }
+
+    iTonePlayingStatus = EIdle;
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::StopPlaying >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::PlayTtsTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::PlayTtsTone(
+    const TDesC& aTextToSay,
+    TInt aVolume,
+    TProfileRingingType aRingingType )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayTtsTone <" );
+    PHONEUIVIEW_PRINTF2(
+        "CPhoneRingingToneSrvPlayerAO::PlayTtsTone - aVolume(%d), aRingingType(%d)",
+        aVolume, aRingingType );
+
+    if ( iTtsPlayer )
+        {
+        delete iTtsPlayer;
+        iTtsPlayer = NULL;
+        }
+
+    //Set ringingtype for Tts.
+    iTtsRingingType = aRingingType;
+    iTtsVolume = aVolume;
+
+    // TTS should be a bit louder, than main component.
+    // No need to check for overflows, they are handled in SET_PHONE_VOLUME macro.
+
+    TPtrC ttsHeader( KPhoneTtsHeader );
+    HBufC* preparedString =
+        HBufC::New( aTextToSay.Length() + ttsHeader.Length() );
+
+    if ( !preparedString )
+        {
+        PHONEUIVIEW_PRINTF3(
+            "CPhoneRingingToneSrvPlayerAO::PlayTtsTone: Couldn't allocate buf %d + %d = %d",
+            aTextToSay.Length(), ttsHeader.Length(), aTextToSay.Length()+ttsHeader.Length() );
+        }
+    else
+        {
+        TPtr pPreparedString = preparedString->Des();
+        pPreparedString.Append( ttsHeader );
+        pPreparedString.Append( aTextToSay );
+
+        PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::PlayTtsTone - about to say %S",
+            &pPreparedString );
+
+        TRAPD(
+            error,
+            iTtsPlayer = CPhoneAudioPlayer::NewTtsL(
+               *preparedString,
+               KAudioPriorityPhoneCall,
+               KAudioPrefTextToSpeechCallHardCoded,
+               *this,
+               EPlayerTts ) );
+        if ( error == KErrNone )
+            {
+            // To be played when default or personal tone will be played
+            iTtsToneToBePlayed = ETrue;
+            }
+        PHONEUIVIEW_PRINTF2(
+            "CPhoneRingingToneSrvPlayerAO::PlayTtsTone - error(%d), iTtsPhoneToBePlayed(%d)",
+            error,
+            iTtsToneToBePlayed );
+
+        delete preparedString;
+        }
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayTtsTone >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::HandleAudioPlayerError
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::HandleAudioPlayerError(
+    TPhoneAudioPlayerErrorEvent /*aEvent*/,
+    TInt aError,
+    TInt /*aId*/ )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandleAudioPlayerError <" );
+    // This is called from CPhoneAudioPlayer - we do not
+    // want to delete instances from which this method
+    // is called.
+
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::HandleAudioPlayerError: error = %d", aError );
+
+    const TBool deleteAll = ( aError == KErrServerTerminated );
+
+    if ( deleteAll )
+        {
+        // KErrServerTerminated is considered as fatal error. So we
+        // need to delete everything.
+
+        for ( TInt i = EPlayerFirst; i <= EPlayerLast; i++ )
+            {
+            DeletePlayerAsync( static_cast< TPlayerId >( i ) );
+            }
+
+        // Now all member audio players point to NULL, except
+        // those players in iAsyncDeletePlayers. Recreate
+        // players.
+
+        ConstructPlayers(); // Ignore error code.
+        }
+
+    iTimer->Cancel();
+    DoHandlePlayerError( !deleteAll, EFalse );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::HandleAudioPlayerInitComplete
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::HandleAudioPlayerInitComplete( TInt aId )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandleAudioPlayerInitComplete <" );
+
+    // This is called from CPhoneAudioPlayer - we do not
+    // want to delete instances from which this method
+    // is called.
+
+    // Complete waiting client
+    if ( iClientMessage.Handle() )
+        {
+        iClientMessage.Complete( KErrNone );
+        }
+
+    if ( iTonePlayingStatus == EAudioTonePlaying && aId == EPlayerAudio ||
+         iTonePlayingStatus == EDefaultTonePlaying && aId == EPlayerDefault )
+        {
+        PHONEUIVIEW_PRINT( "RING TONE FAILSAFE TIMER STOP!!" );
+        iTimer->Cancel();
+        }
+
+    if ( iTtsToneToBePlayed && ( aId != EPlayerTts ) )
+        {
+        // Start TTS timer just before "normal ringtone component" starts
+        // playing, i.e. after init completed.
+        if ( iTtsDelayIndex < iTtsDelaysCount )
+            {
+            if ( !iTtsDelayTimer->IsActive() )
+                {
+                // There are TTS iterations to be played yet.
+                iTtsDelayTimer->After(
+                    KPhoneTtsDelays[iTtsDelayIndex],
+                    TCallBack( HandleTtsDelayTimeout, this ) );
+                }
+            }
+        }
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandleAudioPlayerInitComplete >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete( TInt aId )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete <" );
+    // This is called from CPhoneAudioPlayer - we do not
+    // want to delete instances from which this method
+    // is called.
+
+    // Complete waiting client (shouldn't reach this far, but who knows)
+    if ( iClientMessage.Handle() )
+        {
+        iClientMessage.Complete( KErrNone );
+        }
+
+    PHONEUIVIEW_PRINTF2(
+        "CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete - aId(%d), iRingingType(%d)",
+        aId,
+        iRingingType );
+
+    PHONEUIVIEW_PRINTF2(
+        "CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete - iTtsToneToBePlayed(%d), iTtsDelayIndex(%d)",
+        iTtsToneToBePlayed,
+        iTtsDelayIndex );
+
+    if ( aId == EPlayerTts )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete - resuming after TTS" );
+
+        // TTS playing complete, normal tone player should volume up.
+        if ( ( iTtsToneToBePlayed ) && ( ++iTtsDelayIndex < iTtsDelaysCount ) )
+            {
+            PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete - resuming after TTS first time" );
+
+            //Callers name is said once. increase tone player volume.
+            SolveNewVolumeAndRamptime( ESaidOnce );
+
+            if ( !iTtsDelayTimer->IsActive() )
+                {
+                // There are TTS iterations to be played yet.
+                iTtsDelayTimer->After( KPhoneTtsDelays[iTtsDelayIndex],
+                    TCallBack( HandleTtsDelayTimeout,this ) );
+                }
+            }
+        else
+            {
+            PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete - resuming after TTS second time" );
+            SolveNewVolumeAndRamptime( ESaidTwice );
+            }
+
+        // No further processing. All TTS player-related events are not
+        // "real" ringtone playing completions.
+        return;
+        }
+
+    //Case: RingintonePlayer has completed playing with following set: ring once and
+    // TTS is activated
+    else if ( iRingingType == EProfileRingingTypeRingingOnce &&
+        iTtsToneToBePlayed )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete - ring once and TTS" );
+         if ( iTtsDelayIndex < iTtsDelaysCount )
+            {
+            ReStartRingingTonePlayer();
+            //Do not destroy player yet. Return.
+            return;
+            }
+        }
+    //Case: RingintonePlayer has completed playing with following set: ringing
+    //and TTS is activated. We need  to restart ringintoneplayer and new TTS
+    //iterations are required.
+    else if ( iRingingType == EProfileRingingTypeRinging && iTtsToneToBePlayed )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete - ringing and TTS" );
+        if ( iTtsDelayIndex == iTtsDelaysCount )
+            {
+            //Case: Ringingtype is EProfileRingingTypeRinging. New TTS
+            //iterations are required.
+            PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete - need to restart TTS sequence" );
+            //TTS has completed its iterations,set index to zero.
+            iTtsDelayIndex = 0;
+            if ( !iTtsDelayTimer->IsActive() )
+                {
+                //Restart TTS sequence
+                iTtsDelayTimer->After(
+                    KPhoneTtsDelays[iTtsDelayIndex],
+                    TCallBack( HandleTtsDelayTimeout, this ) );
+                }
+            }
+
+        ReStartRingingTonePlayer();
+        //Do not destroy player yet. Return
+        return;
+        }
+
+    PHONEUIVIEW_PRINTF(
+        "CPhoneRingingToneSrvPlayerAO::HandlePlayingComplete - delete player - iTonePlayingStatus(%d)",
+        iTonePlayingStatus );
+    switch( iTonePlayingStatus )
+        {
+        case EAudioTonePlaying:
+            DeletePlayerAsync( EPlayerAudio );
+            iAudioPlayer = NULL;
+            break;
+
+        case EDefaultTonePlaying:
+            DeletePlayerAsync( EPlayerDefault );
+            iDefaultPlayer = NULL;
+            break;
+
+        case ESilentTonePlaying:
+            DeletePlayerAsync( EPlayerSilent );
+            iSilentPlayer = NULL;
+            break;
+
+        case EUnsecureVoIPTonePlaying:
+            DeletePlayerAsync( EPlayerUnsecureVoIP );
+            iUnsecureVoIPTonePlayer = NULL;
+            break;
+        case EBeepOnce:
+            DeletePlayerAsync( EPlayerBeepOnce );
+            iBeepOncePlayer = NULL;
+            break;
+
+        case EBackupTonePlaying:
+            break;
+
+        default:
+            Panic( EPhoneViewCaseNotHandled );
+            break;
+        }
+
+    iTonePlayingStatus = EIdle;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::HandleTimeOutL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::HandleTimeOutL()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandleTimeOutL <" );
+
+
+    // Guarding timer for startup has expired
+
+
+    PHONEUIVIEW_PRINT( "RING TONE FAILSAFE TIMER TRIGGERED!!" );
+
+    // Start new audio player synchronously.
+    DoHandlePlayerError( ETrue, ETrue );
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandleTimeOutL >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::DoHandlePlayerError
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::DoHandlePlayerError(
+    TBool aDelete,
+    TBool aSync )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::DoHandlePlayerError <" );
+
+    PHONEUIVIEW_PRINTF(
+        "CPhoneRingingToneSrvPlayerAO::DoHandlePlayerError: iTonePlayingStatus = %d",
+        iTonePlayingStatus );
+
+    // Complete waiting client
+    if ( iClientMessage.Handle() )
+        {
+        iClientMessage.Complete( KErrNone );
+        }
+
+    switch ( iTonePlayingStatus )
+        {
+        case EAudioTonePlaying:
+            if ( aDelete )
+                {
+                if ( aSync )
+                    {
+                    delete iAudioPlayer;
+                    }
+                else
+                    {
+                    DeletePlayerAsync( EPlayerAudio );
+                    }
+
+                iAudioPlayer = NULL;
+                }
+
+#ifdef __WINS__
+            PlayAudioRingTone( iVolume, iRingingType, iClientMessage );
+            iTonePlayingStatus = EDefaultTonePlaying;
+#else
+            PlayDefaultTone( iVolume, iRingingType );
+#endif
+            break;
+        case EDefaultTonePlaying:
+            if ( aDelete )
+                {
+                if ( aSync )
+                    {
+                    delete iDefaultPlayer;
+                    }
+                else
+                    {
+                    DeletePlayerAsync( EPlayerDefault );
+                    }
+
+                iDefaultPlayer = NULL;
+                }
+
+            PlayBackupTone( iVolume, iRingingType );
+            break;
+        case ESilentTonePlaying:
+        case EBeepOnce:
+        case EBackupTonePlaying:
+            break;
+        default:
+            break;
+        }
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::DoHandlePlayerError >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::PlayDefaultTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::PlayDefaultTone(
+    TInt aVolume,
+    TProfileRingingType aRingingType )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayDefaultTone()" );
+
+    if( aRingingType == EProfileRingingTypeSilent ||
+        aRingingType == EProfileRingingTypeBeepOnce )
+        {
+        return;
+        }
+
+    if ( !iDefaultRingingTone )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayDefaultTone - default tone does not exist, play backup..." );
+        PlayBackupTone( aVolume, aRingingType );
+        return;
+        }
+
+    // Construct player.
+    if ( !iDefaultPlayer )
+        {
+        iDefaultPlayer = ConstructTonePlayer(
+            *iDefaultRingingTone,
+            EPlayerDefault );
+        if ( !iTimer->IsActive() )
+            {
+            PHONEUIVIEW_PRINT( "RING TONE FAILSAFE TIMER START!!" );
+            iTimer->After( KPhoneMaxRingingWaiting, this );
+            }
+        }
+
+    // Start playing.
+    if ( !iDefaultPlayer )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayDefaultTone - player not constructed, play backup..." );
+        iTimer->Cancel();
+        PlayBackupTone( aVolume, aRingingType );
+        }
+    else
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayDefaultTone - play" );
+        iVolume = aVolume;
+        iRingingType = aRingingType;
+        iTonePlayingStatus = EDefaultTonePlaying;
+        iDefaultPlayer->Play(
+            ConvertRingingType( aRingingType ), aVolume, iTtsToneToBePlayed );
+        }
+
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::PlayBackupTone
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::PlayBackupTone(
+    TInt aVolume,
+    TProfileRingingType aRingingType )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayBackupTone()" );
+    __ASSERT_DEBUG( iBackupPlayer, Panic( EPhoneViewGeneralError ) );
+
+    if ( !iBackupPlayer )
+        {
+        ConstructPlayers();
+        }
+
+    if ( iBackupPlayer )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::PlayBackupTone - play" );
+        iTonePlayingStatus = EBackupTonePlaying;
+
+        // Cease playing text-to-speech, if necessary
+        iTtsToneToBePlayed = EFalse;
+        iTTsTimeOutCounter = 0;
+        iTtsDelayTimer->Cancel();
+        if ( iTtsPlayer )
+            {
+            iTtsPlayer->StopPlaying();
+            delete iTtsPlayer;
+            iTtsPlayer = NULL;
+            }
+
+        iBackupPlayer->Play(
+            ConvertRingingType( aRingingType ), aVolume, EFalse );
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::ConstructTonePlayer
+// -----------------------------------------------------------------------------
+//
+CPhoneAudioPlayer* CPhoneRingingToneSrvPlayerAO::ConstructTonePlayer(
+    const CPhoneRingingTone& aRingingTone,
+    TInt aId )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::ConstructTonePlayer" );
+    return CPhoneAudioPlayer::New(
+        aRingingTone,
+        KAudioPriorityPhoneCall,
+        KAudioPrefIncomingCall,
+        *this,
+        aId,
+        iMdaServer,
+        aId == EPlayerDefault ? EFalse : iExtSecNeeded );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::ConvertRingingType
+// -----------------------------------------------------------------------------
+//
+CPhoneAudioPlayer::TRingingType CPhoneRingingToneSrvPlayerAO::ConvertRingingType(
+    TProfileRingingType aRingingType )
+    {
+    CPhoneAudioPlayer::TRingingType ringingType = 
+        CPhoneAudioPlayer::ETypeRinging;
+    switch ( aRingingType )
+        {
+        case EProfileRingingTypeRinging:
+            ringingType = CPhoneAudioPlayer::ETypeRinging;
+            break;
+
+        case EProfileRingingTypeAscending:
+            ringingType = CPhoneAudioPlayer::ETypeAscending;
+            break;
+
+        case EProfileRingingTypeRingingOnce:
+            ringingType = CPhoneAudioPlayer::ETypeRingingOnce;
+            break;
+
+        default:
+            break;
+        }
+    return ringingType;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::ConstructPlayers
+// -----------------------------------------------------------------------------
+//
+TInt CPhoneRingingToneSrvPlayerAO::ConstructPlayers()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::ConstructPlayers <" );
+    TRAPD( err, ConstructPlayersL() );
+
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::ConstructPlayers: err = %d", err );
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::ConstructPlayers >" );
+    return err;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::ConstructPlayersL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::ConstructPlayersL()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::ConstructPlayersL <" );
+    if ( !iMdaServer )
+        {
+        iMdaServer = CMdaServer::NewL();
+        }
+
+    // Construct Backup player.
+    if ( !iBackupPlayer )
+        {
+        TFileName defaultSoundFile( KDriveZ );
+        defaultSoundFile.Append( KPhoneDefaultSoundFile );
+
+        PHONEUIVIEW_PRINTF(
+            "CPhoneRingingToneSrvPlayerAO::ConstructPlayersL: construct backup player, path = %S",
+            &defaultSoundFile );
+        iBackupPlayer = CPhoneAudioPlayer::NewL(
+            defaultSoundFile,
+            KAudioPriorityPhoneCall,
+            KAudioPrefIncomingCall,
+            *this,
+            EPlayerBackup,
+            iMdaServer
+            );
+        }
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::ConstructPlayersL >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::ConstructSequencePlayer
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::ConstructSequencePlayer( TPlayerId aId )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::ConstructSequencePlayer" );
+
+    // Construct players.
+    TRAPD( err, ConstructSequencePlayerL( aId ) );
+    if ( err )
+        {
+        PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::ConstructSequencePlayer - err(%d)", err );
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::ConstructSequencePlayerL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::ConstructSequencePlayerL( TPlayerId aId )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::ConstructSequencePlayerL <" );
+
+    // Construct beep once player
+    if ( aId == EPlayerBeepOnce )
+        {
+#ifdef __WINS__
+        TParse* fp = new (ELeave) TParse();
+        fp->Set( KPhoneBeepOnceSoundFile, &KDC_RESOURCE_FILES_DIR, NULL );
+        TFileName fileName( fp->FullName() );
+        delete fp;
+
+        iBeepOncePlayer = CPhoneAudioPlayer::NewL(
+            fileName,
+            KAudioPriorityPhoneCall,
+            KAudioPrefIncomingCall,
+            *this,
+            EPlayerBeepOnce );
+#else
+        iBeepOncePlayer = CPhoneAudioPlayer::NewSeqL(
+            KPhoneBeepSequence(),
+            KAudioPriorityPhoneCall,
+            KAudioPrefIncomingCall,
+            *this,
+            EPlayerBeepOnce );
+#endif // __WINS__
+        }
+
+    // Construct Silent Player.
+    else if ( aId == EPlayerSilent )
+        {
+#ifdef __WINS__
+        TParse* fp = new (ELeave) TParse();
+        fp->Set( KPhoneSilentSoundFile, &KDC_RESOURCE_FILES_DIR, NULL );
+        TFileName fileName( fp->FullName() );
+        delete fp;
+
+        iSilentPlayer = CPhoneAudioPlayer::NewL(
+            fileName,
+            KAudioPriorityPhoneCall,
+            KAudioPrefIncomingCall,
+            *this,
+            EPlayerSilent );
+#else
+        iSilentPlayer = CPhoneAudioPlayer::NewSeqL(
+            KPhoneNoSoundSequence(),
+            KAudioPriorityPhoneCall,
+            KAudioPrefIncomingCall,
+            *this,
+            EPlayerSilent );
+#endif // __WINS__
+        }
+    // Construct unsecure VoIP tone player.
+    else if ( aId == EPlayerUnsecureVoIP )
+        {
+#ifdef __WINS__
+        TParse* fp = new (ELeave) TParse();
+        fp->Set( KPhoneBeepOnceSoundFile, &KDC_RESOURCE_FILES_DIR, NULL );
+        TFileName fileName( fp->FullName() );
+        delete fp;
+
+        iUnsecureVoIPTonePlayer = CPhoneAudioPlayer::NewL(
+            fileName,
+            KAudioPrioritySpecialInformationTone,
+            KAudioPrefSpecialInformation,
+            *this,
+            EPlayerUnsecureVoIP );
+#else
+        iUnsecureVoIPTonePlayer = CPhoneAudioPlayer::NewSeqL(
+            KPhoneUnsecureVoIPCall(),
+            KAudioPrioritySpecialInformationTone,
+            KAudioPrefSpecialInformation,
+            *this,
+            EPlayerUnsecureVoIP );
+#endif // __WINS__
+        }
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::ConstructSequencePlayerL >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::CleanupPlayers
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::CleanupPlayers()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::CleanupPlayers <" );
+
+    delete iAudioPlayer;
+    iAudioPlayer = NULL;
+
+    delete iDefaultPlayer;
+    iDefaultPlayer = NULL;
+
+    delete iBeepOncePlayer;
+    iBeepOncePlayer = NULL;
+
+    delete iSilentPlayer;
+    iSilentPlayer = NULL;
+
+    delete iUnsecureVoIPTonePlayer;
+    iUnsecureVoIPTonePlayer = NULL;
+
+    delete iBackupPlayer;
+    iBackupPlayer = NULL;
+
+    delete iMdaServer;
+    iMdaServer = NULL;
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::CleanupPlayers >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::DeletePlayerAsync
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::DeletePlayerAsync( TPlayerId aPlayer )
+    {
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::DeletePlayerAsync(%d) <", aPlayer );
+
+    __ASSERT_DEBUG( aPlayer >= EPlayerFirst && aPlayer < iAsyncDeletePlayers.Count(),
+        Panic( EPhoneViewInvariant ) );
+
+    // Player is not deleted here, but in RunL.
+    Cancel();
+
+    if ( iAsyncDeletePlayers[ aPlayer ] )
+        {
+        delete iAsyncDeletePlayers[ aPlayer ];
+        iAsyncDeletePlayers[ aPlayer ] = NULL;
+        }
+
+    CPhoneAudioPlayer** players[] =
+        {
+        &iAudioPlayer,
+        &iBeepOncePlayer,
+        &iSilentPlayer,
+        &iUnsecureVoIPTonePlayer,
+        &iDefaultPlayer,
+        &iBackupPlayer,
+        &iTtsPlayer
+        };
+
+    __ASSERT_DEBUG( iAsyncDeletePlayers.Count() > aPlayer, Panic( EPhoneUtilsIndexOutOfBounds ) );
+
+    iAsyncDeletePlayers[ aPlayer ] = *(players[ aPlayer ]);
+    *(players[ aPlayer ]) = NULL;
+
+    iState = EDeletingAudioPlayer;
+
+    TRequestStatus* status = &iStatus;
+    User::RequestComplete( status, KErrNone );
+    SetActive();
+
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::DeletePlayerAsync(%d) >", aPlayer );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::RunL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::RunL()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::RunL <" );
+
+    switch ( iState )
+        {
+        case EDeletingAudioPlayer:
+            {
+            for ( TInt i = EPlayerFirst; i <= EPlayerLast; i++ )
+                {
+                delete iAsyncDeletePlayers[ i ];
+                iAsyncDeletePlayers[ i ] = NULL;
+                }
+            }
+            break;
+
+        case EIdleState:
+        default:
+            break;
+        } // switch iState
+
+    iState = EIdleState;
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::RunL >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::DoCancel
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::DoCancel()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::DoCancel" );
+    // Request is completed immediately before SetActive.
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::HandleTtsDelayTimeout
+// -----------------------------------------------------------------------------
+//
+TInt CPhoneRingingToneSrvPlayerAO::HandleTtsDelayTimeout( TAny* aObject )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandleTtsDelayTimeout <" );
+    static_cast<CPhoneRingingToneSrvPlayerAO*>( aObject )->
+        DoHandleTtsDelayTimeout();
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::HandleTtsDelayTimeout >" );
+    return KErrNone;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::DoHandleTtsDelayTimeout
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::DoHandleTtsDelayTimeout()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::DoHandleTtsDelayTimeout()" );
+    PHONEUIVIEW_PRINTF2(
+        "CPhoneRingingToneSrvPlayerAO::DoHandleTtsDelayTimeout - iTtsRingingType(%d), iTTsTimeOutCounter(%d)",
+        iTtsRingingType, iTTsTimeOutCounter );
+
+    CPhoneAudioPlayer* currPlayer = GetCurrentlyActiveAudioPlayerWithTTs();
+
+    if ( !currPlayer )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::DoHandleTtsDelayTimeout - null current player" );
+        return;
+        }
+    TInt volume( 0 );
+     //Ascending case. TTs player needs to be ascending.
+    if ( iTtsRingingType == EProfileRingingTypeAscending )
+        {
+        //Volume needs to be different in different ascending steps
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::DoHandleTtsDelayTimeout - play ascending" );
+        if ( !iTTsTimeOutCounter )
+            {
+            //We are saying callers name for the first time in ascending mode.
+            //Say callers name by volume level KTtsVolumeMin.
+            volume = KTtsVolumeMin;
+
+            iTtsPlayer->Play(
+                ConvertRingingType( EProfileRingingTypeRingingOnce ),
+                volume,
+                iTtsToneToBePlayed );
+            }
+        else
+            {
+            //Checks the case that ringingtone is very quiet. Then do not play
+            //TTS too loud
+            volume = iTtsVolume < KTtsVolumeMin ? KTtsVolumeMin : KTtsVolumeAscendingRepeat;
+
+            //We are saying callers name for the second time in ascending mode.
+            //Say callers name by volume level KTtsVolumeAscendingRepeat and decrease current players volume
+            //to KPlayerVolumeAscendingRepeat. RampTime is zero
+            currPlayer->SetNewVolumeAndRamptime( KPlayerVolumeAscendingRepeat, 0 );
+            iTtsPlayer->Play(
+                ConvertRingingType( EProfileRingingTypeRingingOnce ),
+                volume,
+                iTtsToneToBePlayed );
+            }
+
+        }
+    else //Normal ringing case.
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::DoHandleTtsDelayTimeout - play normal" );
+        currPlayer->SetNewVolumeAndRamptime( iTtsVolume-5, 0 );
+        iTtsPlayer->Play(
+            ConvertRingingType( EProfileRingingTypeRingingOnce ),
+            iTtsVolume,
+            iTtsToneToBePlayed );
+        }
+
+     iTTsTimeOutCounter++;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::AddTtsPlaybackIfNeeded
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::AddTtsPlaybackIfNeeded(
+        TProfileRingingType /*aRingingType*/ )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::AddTtsPlaybackIfNeeded" );
+    if ( iTtsToneToBePlayed )
+        {
+        iTtsDelayIndex = 0;
+        iTtsDelaysCount = KPhoneTtsDelaysCount;
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::ExtendedSecurity
+// -----------------------------------------------------------------------------
+//
+TBool CPhoneRingingToneSrvPlayerAO::ExtendedSecurity() const
+    {
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::ExtendedSecurity: %d", iExtSecNeeded );
+    return iExtSecNeeded;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::SolveNewVolumeAndRamptime
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::SolveNewVolumeAndRamptime( TTtsStatus aStatus )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::SolveNewVolumeAndRamptime <" );
+
+    CPhoneAudioPlayer* currPlayer = NULL;
+    currPlayer = GetCurrentlyActiveAudioPlayerWithTTs();
+    if ( !currPlayer )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::SolveNewVolumeAndRamptime - null current player" );
+        return;
+        }
+    TInt ramptime( 0 );
+    //Here is handled the cases when Callers name is said. Sequence is:
+    //3 sec. tone + name + 4 sec. tone + name +the tone until the end.
+    switch ( aStatus )
+        {
+        case ESaidOnce:
+            if ( iTtsRingingType == EProfileRingingTypeAscending )
+                {
+                //The ramptime could be ( 4 )* KPhoneTtsAscendingStep but now
+                //we are setting this to 0 because when Say callers name is said
+                //for first time: play ringing tone on level 3 for four secs.
+                ramptime = 0;
+                PHONEUIVIEW_PRINTF(
+                    "CPhoneRingingToneSrvPlayerAO::SolveNewVolumeAndRamptime - said once ascending - ramptime(%d)",
+                    ramptime );
+                currPlayer->SetNewVolumeAndRamptime( KPlayerVolumeAscendingRepeat, ramptime );
+                }
+            else
+                {
+                 //Normal ringingtone case. Adjust volume back to profile level.
+                PHONEUIVIEW_PRINTF(
+                    "CPhoneRingingToneSrvPlayerAO::SolveNewVolumeAndRamptime - said once normal - ramptime(%d)",
+                    ramptime );
+                currPlayer->SetNewVolumeAndRamptime( iTtsVolume, 0 );
+                }
+             break;
+
+        case ESaidTwice:
+            if ( iTtsRingingType == EProfileRingingTypeAscending )
+                {
+                TInt vol = iTtsVolume;
+                if ( vol > KPlayerVolumeAscendingRepeat )
+                    {
+                    vol = vol - KTtsVolumeAscendingDecrease;
+                    }
+
+                //TTS playing complete for second time. increase tone player volume.
+                ramptime = ( vol )*KPhoneTtsAscendingStep;
+                PHONEUIVIEW_PRINTF(
+                    "CPhoneRingingToneSrvPlayerAO::SolveNewVolumeAndRamptime - said twice ascending - ramptime(%d)",
+                    ramptime );
+                currPlayer->SetNewVolumeAndRamptime( iTtsVolume, ramptime );
+                }
+            else
+                {
+                 //Normal ringingtone case. Adjust volume back to profile level.
+                PHONEUIVIEW_PRINTF(
+                    "CPhoneRingingToneSrvPlayerAO::SolveNewVolumeAndRamptime - said twice normal - ramptime(%d)",
+                    ramptime );
+                currPlayer->SetNewVolumeAndRamptime( iTtsVolume, 0 );
+                }
+            break;
+
+        default:
+            break;
+        }
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::GetCurrentlyActiveAudioPlayerWithTTs
+// -----------------------------------------------------------------------------
+//
+CPhoneAudioPlayer*
+CPhoneRingingToneSrvPlayerAO::GetCurrentlyActiveAudioPlayerWithTTs()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::GetCurrentlyActiveAudioPlayerWithTTs" );
+
+    if( iAudioPlayer )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::GetCurrentlyActiveAudioPlayerWithTTs - audio player" );
+        return iAudioPlayer;
+        }
+    else if ( iDefaultPlayer )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::GetCurrentlyActiveAudioPlayerWithTTs - default player" );
+        return iDefaultPlayer;
+        }
+    else if( iBackupPlayer )
+        {
+        PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::GetCurrentlyActiveAudioPlayerWithTTs - backup player" );
+        return iBackupPlayer;
+        }
+    else
+        {
+        return NULL;
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::ReStartRingingTonePlayer
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::ReStartRingingTonePlayer()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::ReStartRingingTonePlayer <" );
+
+    //First get currently active player which plays among TTS player.
+    CPhoneAudioPlayer* currPlayer = NULL;
+    currPlayer = GetCurrentlyActiveAudioPlayerWithTTs();
+    if ( currPlayer )
+        {
+        currPlayer->ReStartPlaying();
+        }
+
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::ReStartRingingTonePlayer >" );
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::CheckAndHandleToneSizeLimit
+// -----------------------------------------------------------------------------
+//
+TBool CPhoneRingingToneSrvPlayerAO::CheckAndHandleToneSizeLimit(
+     CPhoneRingingTone* aRingingTone )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::CheckAndHandleToneSizeLimit" );
+    TBool bValidSize = ETrue;
+
+    // If user has somehow managed to get a too large file as ringing tone,
+    // play default tone instead.
+    if ( iToneFileSizeLimitKB )
+        {
+        if ( CheckToneFileSize( aRingingTone->FileName(), iToneFileSizeLimitKB) != KErrNone )
+            {
+            bValidSize = EFalse;
+            }
+        }
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::CheckAndHandleToneSizeLimit - bValidSize(%d)", bValidSize );
+    return bValidSize;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::CheckToneFileSize
+// -----------------------------------------------------------------------------
+//
+TInt CPhoneRingingToneSrvPlayerAO::CheckToneFileSize( const TDesC& aFile, TInt aSizeLimitKB )
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::CheckToneFileSize" );
+
+    // Get file size
+    TInt size = 0;
+    TInt error = KErrNone;
+
+    TEntry entry;
+    if ( KErrNone == iFs.Entry( aFile, entry ))
+        {
+        size = entry.iSize;
+        }
+
+    // Check
+    aSizeLimitKB *= Kkilo;
+    if ( aSizeLimitKB && size > aSizeLimitKB )
+        {
+        error = KErrTooBig;
+        }
+
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::CheckToneFileSize: size = %d", size );
+    return error;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::ActiveAudioPlayer
+// -----------------------------------------------------------------------------
+//
+CPhoneAudioPlayer* CPhoneRingingToneSrvPlayerAO::ActiveAudioPlayer()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneSrvPlayerAO::ActiveAudioPlayer" );
+
+    switch( iTonePlayingStatus )
+        {
+        case EAudioTonePlaying:
+            if ( iAudioPlayer )
+                {
+                return iAudioPlayer;
+                }
+            break;
+
+        case EDefaultTonePlaying:
+            if ( iDefaultPlayer )
+                {
+                return iDefaultPlayer;
+                }
+            break;
+
+        case EBeepOnce:
+            if ( iBeepOncePlayer )
+                {
+                return iBeepOncePlayer;
+                }
+            break;
+
+        case EBackupTonePlaying:
+            if ( iBackupPlayer )
+                {
+                return iBackupPlayer;
+                }
+            break;
+
+        case ESilentTonePlaying:
+            if ( iSilentPlayer )
+                {
+                return iSilentPlayer;
+                }
+            break;
+
+        case EUnsecureVoIPTonePlaying:
+            if ( iUnsecureVoIPTonePlayer )
+                {
+                return iUnsecureVoIPTonePlayer;
+                }
+            break;
+
+        default:
+            break;
+        }
+
+    return NULL;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::SetExtendedSecurityNeeded
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::SetExtendedSecurityNeeded( TBool aNeeded )
+    {
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::SetExtendedSecurityNeeded: %d", aNeeded );
+
+    iExtSecNeeded = aNeeded;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::SetToneFileSizeLimit
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::SetToneFileSizeLimit( TInt aLimit )
+    {
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::SetToneFileSizeLimit: %d", aLimit );
+
+    iToneFileSizeLimitKB = aLimit;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::SetRingingToneL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::SetRingingToneL( const TDesC& aFilename )
+    {
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::SetRingingToneL: %S", &aFilename );
+
+    if ( !iAudioVideoRingingTone )
+        {
+        iAudioVideoRingingTone = CPhoneRingingTone::NewL( aFilename );
+        }
+    else if ( iAudioVideoRingingTone->FileName().Compare( aFilename ) )
+        {
+        iAudioVideoRingingTone->SetFileName( aFilename );
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneSrvPlayerAO::SetDefaultRingingToneL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneSrvPlayerAO::SetDefaultRingingToneL( const TDesC& aFilename )
+    {
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneSrvPlayerAO::SetDefaultRingingToneL: %S", &aFilename );
+
+    if ( !iDefaultRingingTone )
+        {
+        iDefaultRingingTone = CPhoneRingingTone::NewL( aFilename );
+        }
+    else if ( iDefaultRingingTone->FileName().Compare( aFilename ) )
+        {
+        iDefaultRingingTone->SetFileName( aFilename );
+        }
+    }
+
+//  End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiview/src/phoneringingtonesrvsession.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,136 @@
+/*
+* Copyright (c) 2002-2005,2007 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:  Phone ringing tone server session.
+*
+*/
+
+
+// INCLUDE FILES
+#include <e32base.h>
+#include <e32svr.h>
+
+#include "MPhoneRingingToneSrv.h"
+#include "PhoneRingingToneSrv.hrh"
+#include "PhoneRingingToneSrvSession.h"
+#include "phoneuiviewtrace.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServerSession::CPhoneRingingToneServerSession
+// -----------------------------------------------------------------------------
+//
+CPhoneRingingToneServerSession::CPhoneRingingToneServerSession( MPhoneRingingToneServer& aServer )
+    : iServer( aServer )
+    {
+    }
+
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServerSession::~CPhoneRingingToneServerSession
+// -----------------------------------------------------------------------------
+//
+CPhoneRingingToneServerSession::~CPhoneRingingToneServerSession()
+    {
+    iServer.DecrementSessions();
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServerSession::NewL
+// -----------------------------------------------------------------------------
+//
+CPhoneRingingToneServerSession* CPhoneRingingToneServerSession::NewL( MPhoneRingingToneServer& aServer )
+    {
+    CPhoneRingingToneServerSession* self = new (ELeave) CPhoneRingingToneServerSession( aServer );
+
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop(); // self
+
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServerSession::ConstructL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServerSession::ConstructL()
+    {
+    PHONEUIVIEW_PRINT( "CPhoneRingingToneServerSession::ConstructL" );
+    iServer.IncrementSessions();
+    }
+
+// -----------------------------------------------------------------------------
+// CPhoneRingingToneServerSession::ServiceL
+// -----------------------------------------------------------------------------
+//
+void CPhoneRingingToneServerSession::ServiceL( const RMessage2& aMessage )
+    {
+    PHONEUIVIEW_PRINTF( "CPhoneRingingToneServerSession::ServiceL: func=%d", aMessage.Function() );
+
+    TBool noComplete = EFalse;
+
+    switch ( aMessage.Function() )
+        {
+        case ESetExtendedSecurityNeeded:
+            iServer.SetExtendedSecurityNeeded( aMessage.Int0() );
+            break;
+        case ESetToneFileSizeLimit:
+            iServer.SetToneFileSizeLimit( aMessage.Int0() );
+            break;
+        case ESetAudioRingingTone:
+            iServer.SetRingingToneL( aMessage );
+            break;
+        case ESetDefaultRingingTone:
+            iServer.SetDefaultRingingToneL( aMessage );
+            break;
+
+        // Playback control
+        case EPlayAudioRingTone:
+            noComplete = iServer.PlayAudioRingTone( aMessage );
+            break;
+        case EPlayTtsTone:
+            iServer.PlayTtsTone( aMessage );
+            break;
+        case EPlayDefaultTone:
+            iServer.PlayDefaultTone( aMessage );
+            break;
+        case EPlayBackupTone:
+            iServer.PlayBackupTone( aMessage );
+            break;
+        case EPlaySilentTone:
+            iServer.PlaySilentTone();
+            break;
+        case EBeepOnce:
+            iServer.BeepOnce( aMessage );
+            break;
+        case EPlayUnsecureVoIPTone:
+            iServer.PlayUnsecureVoIPTone();
+            break;
+
+        case EMuteRingingTone:
+            iServer.MuteRingingTone();
+            break;
+        case EStopPlaying:
+            iServer.StopPlaying();
+            break;
+        default:
+            break;
+        }
+
+    if ( !noComplete )
+        {
+        aMessage.Complete( KErrNone );
+        }
+    }
--- a/phoneapp/phoneuivoipextension/src/cphoneresourceresolvervoip.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuivoipextension/src/cphoneresourceresolvervoip.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -219,7 +219,7 @@
             retVal = R_PHONE_VOIP_QUERY_ACC_ID_HEADER;
             break;
         case EPhoneVoIPTransferAddress:
-            retVal = R_VOIP_TRANSFER_ADDRESS;
+            retVal = R_VOIP_DIALER_UNATT_TRANSFER_INPUT_FIELD_TEXT;           
             break;
         case EPhoneVoIPTransferDialerNumberEntryEmptyMenubar:
             retVal = R_PHONEUIDIALER_NUMBERENTRY_EMPTY_TRANSFER_MENUBAR;
--- a/phoneapp/phoneuivoipextension/srcdata/phoneuivoip.rss	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/phoneuivoipextension/srcdata/phoneuivoip.rss	Mon Mar 15 12:40:24 2010 +0200
@@ -853,7 +853,7 @@
         MENU_ITEM 
             {
             command = EPhoneCmdTransferDialerOk; 
-            txt = text_softkey_accept;
+            txt = qtn_dialer_options_send_uatransfer_req;
             }, 
         MENU_ITEM 
             {
@@ -909,7 +909,7 @@
 //
 RESOURCE TBUF r_voip_dialer_tooltip_accept
     {
-    buf = text_softkey_accept;
+    buf = qtn_dialer_options_send_uatransfer_req;
     } 
 
 // -----------------------------------------------------------------------------
@@ -1368,6 +1368,17 @@
 
 //-----------------------------------------------------------------------------
 //
+//    r_voip_dialer_unatt_transfer_input_field_text "Address:"
+//
+// -----------------------------------------------------------------------------
+// 
+RESOURCE TBUF r_voip_dialer_unatt_transfer_input_field_text
+    {
+    buf = qtn_dialer_unatt_transfer_input_field_text;
+    }
+
+//-----------------------------------------------------------------------------
+//
 //    r_phoneui_numberacq_options_menu_item_xsp
 //    "%U call"
 //   
--- a/phoneapp/silenceactionplugin/data/silence.rul	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneapp/silenceactionplugin/data/silence.rul	Mon Mar 15 12:40:24 2010 +0200
@@ -1,133 +1,45 @@
 <script xmlns="http://www.nokia.com/ns/cep/script/1.0/"
 xmlns:cep="http://www.nokia.com/ns/cep/1.0/">
-    <!-- Must have sensor interaction active -->
+
+    <!-- Check if we have incoming call and we receive display down orientation event -->
     <if>
-        <equals>
-            <contextRef source='Sensor' type='Setting.Active'/>
-            <string>Off</string>
-        </equals>
-        <actions>
-        </actions>
-    </if>
-    <!-- Check if we have incoming call and we receive a double tap event -->
-    <elseIf>
         <and>
-            <!-- Must have a ringin call and receive new double tap event or orientation event from sensor -->
+            <!-- Must have a ringin call and receive orientation event from sensor -->
             <equals>
                 <contextRef source='Call' type='State'/>
                 <string>Ringing</string>
             </equals>
-            <or>
-                <and>
-                    <!-- Check that double tap interaction is set -->
-                    <equals>
-                        <contextRef source='Sensor' type='Setting.TappingInteraction.SilenceCalls'/>
-                        <string>On</string>
-                    </equals>
-                    <contextUpdated>
-                        <contextRef source='Sensor' type='Event.DoubleTap'/>
-        	          </contextUpdated>
-                </and>
-    	          <and>
-                    <!-- Check that turning interaction is set -->
-                    <equals>
-                        <contextRef source='Sensor' type='Setting.TurningInteraction.SilenceCalls'/>
-                        <string>On</string>
-                    </equals>
-                    <!-- ...and previous orientation is not 'Undefined' ... -->
-                    <notEqual>
-                        <contextRef source='Sensor' type='Event.Orientation.Previous'/>
-                        <string>Undefined</string>
-                    </notEqual>
-		                <contextChanged>
-		                    <contextRef source='Sensor' type='Event.Orientation'/>
-		    	    	    </contextChanged>
-    	        	    <equals>
-                        <contextRef source='Sensor' type='Event.Orientation'/>
-                    	  <string>DisplayDownwards</string>
-    	              </equals>
-    	          </and>
-            </or>
+            <equals>
+                <contextRef source='Sensor' type='Setting.Active'/>
+                <string>On</string>
+            </equals>
+            <!-- Check that turning interaction is set -->
+            <equals>
+                <contextRef source='Sensor' type='Setting.TurningInteraction.SilenceCalls'/>
+                <string>On</string>
+            </equals>
+            <!-- ...and previous orientation is not 'Undefined' ... -->
+            <notEqual>
+                <contextRef source='Sensor' type='Event.Orientation.Previous'/>
+                <string>Undefined</string>
+            </notEqual>
+            <contextChanged>
+                <contextRef source='Sensor' type='Event.Orientation'/>
+            </contextChanged>
+            <equals>
+                <contextRef source='Sensor' type='Event.Orientation'/>
+                <string>DisplayDownwards</string>
+            </equals>
         </and>
         <actions>
+            <!-- DEBUG -->
+            <!-- <publishContext><contextRef source="Test" type="Log" value="silence.rul - 01 silence call only"/></publishContext> -->
+
             <!-- Silence ringing tone -->
             <Phone Command='Silence'/>
             <!-- Vibra feedback -->
             <Vibra Mode='Start' Delay='0' Repeats='2' RepeatInterval='200' Duration='50' Intensity='50'/>
         </actions>
-    </elseIf>
-    <!-- Check if we just have incoming call -->
-    <elseIf>
-        <and>
-            <!-- Check that the feature has not yet been enabled -->
-            <notEqual>
-                <contextRef source='Sensor' type='Event.AutoRotateAndDoubleTap'/>
-                <string>Enabled</string>
-            </notEqual>
-            <equals>
-                <contextRef source='Call' type='State'/>
-                <string>Ringing</string>
-            </equals>
-        </and>
-        <actions>
-            <!-- Activate double tap events from sensor -->
-            <publishContext>
-                <contextRef source='Sensor'
-                    type='Event'
-                    value='DoubleTap.Activate'/>
-            </publishContext>
-            <!-- Activate orientation events from sensor -->
-            <publishContext>
-                <contextRef source='Sensor'
-                    type='Event'
-                    value='Orientation.Activate'/>
-            </publishContext>
-            
-            <!-- Mark feature as 'Enabled' -->
-            <publishContext>
-                <contextRef source="Sensor" type="Event.AutoRotateAndDoubleTap" value="Enabled"/>
-            </publishContext>
-        
-        </actions>
-    </elseIf>
-    <!-- If we have call in 'Connected' or 'Disconnected' state -->
-    <elseIf>
-        <!-- Check that the feature has not already been disabled -->
-        <and>
-            <notEqual>
-                <contextRef source='Sensor' type='Event.AutoRotateAndDoubleTap'/>
-                <string>Disabled</string>
-            </notEqual>
-            <or>
-                <equals>
-                    <contextRef source='Call' type='State'/>
-                    <string>Connected</string>
-                </equals>
-                <equals>
-                    <contextRef source='Call' type='State'/>
-                    <string>Disconnected</string>
-                </equals>
-            </or>
-        </and>
-        <actions>
-            <!-- Deactivate double tap events from sensor -->
-            <publishContext>
-                <contextRef source='Sensor'
-                    type='Event'
-                    value='DoubleTap.Deactivate'/>
-            </publishContext>
-            <!-- Deactivate orientation events from sensor -->
-            <publishContext>
-                <contextRef source='Sensor'
-                    type='Event'
-                    value='Orientation.Deactivate'/>
-            </publishContext>
-            
-            <!-- Mark feature as 'Disabled' -->
-            <publishContext>
-                <contextRef source="Sensor" type="Event.AutoRotateAndDoubleTap" value="Disabled"/>
-            </publishContext>
-        
-        </actions>
-    </elseIf>
+    </if>
+
 </script>
\ No newline at end of file
--- a/phoneengine/callhandling/src/cpecallhandling.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneengine/callhandling/src/cpecallhandling.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -446,11 +446,11 @@
             CPESingleCall* call;
             call = static_cast<CPESingleCall*>( iCallArrayOwner->CallByCallId( aCallId ) );
                                  
+            MCCECall& connectedCall = call->Call();
+            CCPCall::TCallType callType = connectedCall.Parameters().CallType();
+ 
             if ( EPEStateConnected == call->GetCallState() )
-                {
-                MCCECall& connectedCall = call->Call();
-                CCPCall::TCallType callType = connectedCall.Parameters().CallType();
-                
+                {                
                 if ( callType == CCPCall::ECallTypePS ) 
                     {
                     TEFLOGSTRING( KTAMESINT, 
@@ -472,11 +472,11 @@
                         iModel.SendMessage( MEngineMonitor::EPEMessageColpNumberAvailable, aCallId );
                         }
                     }
-                
-                iModel.DataStore()->SetRemotePartyName( connectedCall.RemotePartyName(), aCallId );                
-                iModel.DataStore()->SetRemotePhoneNumber( connectedCall.RemoteParty().Left( KPEPhoneNumberMaxLength ), aCallId );
-                iModel.DataStore()->SetCallIndex(connectedCall.CallIndex(), aCallId );
                 }
+            // CNAP informations must be in incoming call
+            iModel.DataStore()->SetRemotePartyName( connectedCall.RemotePartyName(), aCallId );                
+            iModel.DataStore()->SetRemotePhoneNumber( connectedCall.RemoteParty().Left( KPEPhoneNumberMaxLength ), aCallId );
+            iModel.DataStore()->SetCallIndex( connectedCall.CallIndex(), aCallId );            
             break;
             }
                    
Binary file phoneengine/phonemodel/conf/s60telephony.confml has changed
Binary file phoneengine/phonemodel/conf/s60telephony_102828F8.crml has changed
--- a/phoneengine/phonemodel/inc/telephonyvariant.hrh	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneengine/phonemodel/inc/telephonyvariant.hrh	Mon Mar 15 12:40:24 2010 +0200
@@ -90,11 +90,6 @@
 #define KTelephonyLVFlagAdvancedENCheck 0x00000200
 
 /**
-* KTelephonyLVFlagDisableCallControlHardKeysWhileLocked 
-*/
-#define KTelephonyLVFlagDisableCallControlHardKeysWhileLocked 0x00000400 
-
-/**
 * KTelephonyLVFlagUssdTone defines if the USSD tone play functionality is 
 * enabled.
 * When the flag is set, tone is played when USSD message is received. 
@@ -112,11 +107,6 @@
 #define KTelephonyLVFlagArbitraryVideoScaling 0x00001000
 
 /**
-* KTelephonyLVFlagAllowUnlockOnIncoming 
-*/
-#define KTelephonyLVFlagAllowUnlockOnIncoming 0x00002000 
-
-/**
 * KTelephonyLVFlagMannerMode defines if the manner mode is enabled.
 * When the flag is set, long press on hash key toggles silent on/off
 * @since Series 60 2.8
--- a/phoneuis/BubbleManager/Src/BMBubbleManager.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/BubbleManager/Src/BMBubbleManager.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -340,9 +340,6 @@
     
     if ( iConfigFlags & EBMTouchCallhandling )
         {
-        MBubbleTouchPaneInterface* touchPaneIf =
-            static_cast<MBubbleTouchPaneInterface*> (iTouchPane);             
-        
         if ( iTouchPane->IsVisible() )
             {
             TInt variety = 0;
@@ -3521,6 +3518,8 @@
     {
     __ASSERT_ALWAYS( ( iConfigFlags & EBMCallObjectDisplay ), 
                        Panic( EBMPanicFeatureNotSupported ) );
+    StartChanges();
+    iMainPaneControl->Reset();
     if ( aPreload )
         {
         iCallObjectManager->LoadCallThemeImage( 
@@ -3531,6 +3530,7 @@
         {
         iCallObjectManager->ReleaseCallThemeImage();
         }        
+    EndChanges();
     }
 
 // ---------------------------------------------------------------------------
--- a/phoneuis/Ussd/group/ussd.mmp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/Ussd/group/ussd.mmp	Mon Mar 15 12:40:24 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -62,13 +62,14 @@
 LIBRARY    hlplch.lib // for "Help" options menu 
 LIBRARY    FeatMgr.lib
 LIBRARY    CdlEngine.lib
-LIBRARY    charconv.lib            // for detecting unicode chars
+LIBRARY    charconv.lib // for detecting unicode chars
 LIBRARY    CommonEngine.lib
-
 LIBRARY     AknLayout2Scalable.lib
 LIBRARY    AknSkins.lib
 LIBRARY    etext.lib
 LIBRARY    CentralRepository.lib
+LIBRARY    peninputclient.lib
+LIBRARY    flogger.lib
 
 // ============================================================================
 // AIF
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneuis/Ussd/inc/UssdLogger.h	Mon Mar 15 12:40:24 2010 +0200
@@ -0,0 +1,90 @@
+/*
+* 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:  Logger headerfile for CbsServer
+*
+*/
+
+#ifndef USSDLOGGER_H
+#define USSDLOGGER_H
+
+/* 
+-----------------------------------------------------------------------------
+    LOGGIN MODE SELECTION
+-----------------------------------------------------------------------------
+*/
+#ifndef _DEBUG
+    // UREL BUILD:
+    #define USSDUI_LOGGING_METHOD 0   // No logging in UREL builds
+#else
+    // UDEB BUILD:
+    // 0 = No logging, 
+    // 1 = Flogger, 
+    // 2 = RDebug
+    #define USSDUI_LOGGING_METHOD 2   
+#endif //_DEBUG
+
+/* 
+-----------------------------------------------------------------------------
+    FILE LOGGING SETTINGS
+-----------------------------------------------------------------------------
+*/
+#if USSDUI_LOGGING_METHOD == 1      // Flogger
+    #include <flogger.h>
+    _LIT(KCbsLogFolder, "ussdui");
+    _LIT(KCbsLogFile, "ussdui.txt");
+
+#elif USSDUI_LOGGING_METHOD == 2    // RDebug
+
+    #include <e32svr.h>
+
+#endif //USSDUI_LOGGING_METHOD
+
+/*
+-----------------------------------------------------------------------------
+    IMPLEMENTATION OF THE LOGGING MACROs
+    USE THESE MACROS IN YOUR CODE
+----------------------------------------------------------------------------
+*/
+
+
+#if USSDUI_LOGGING_METHOD == 1      // Flogger
+
+#define _LOGTEXT(AAA) /*lint -save -e960 */ { RFileLogger::Write(KCbsLogFolder(),KCbsLogFile(),EFileLoggingModeAppend,AAA); } /*lint -restore */
+#define _LOGSTRING(AAA) /*lint -save -e960 */ { _LIT(tempLogDes,AAA); RFileLogger::Write(KCbsLogFolder(),KCbsLogFile(),EFileLoggingModeAppend,tempLogDes()); } /*lint -restore */
+#define _LOGSTRING2(AAA,BBB) /*lint -save -e960 -e437 */ { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KCbsLogFolder(),KCbsLogFile(),EFileLoggingModeAppend,TRefByValue<const TDesC>(tempLogDes()),BBB); } /*lint -restore */
+#define _LOGSTRING3(AAA,BBB,CCC) /*lint -save -e960 */ { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KCbsLogFolder(),KCbsLogFile(),EFileLoggingModeAppend,TRefByValue<const TDesC>(tempLogDes()),BBB,CCC); } /*lint -restore */
+
+#elif USSDUI_LOGGING_METHOD == 2    // RDebug
+
+#define _LOGTEXT(AAA)              RDebug::Print(AAA);
+#define _LOGSTRING(AAA)            RDebug::Print(_L(AAA));
+#define _LOGSTRING2(AAA,BBB)       RDebug::Print(_L(AAA),BBB);
+#define _LOGSTRING3(AAA,BBB,CCC)   RDebug::Print(_L(AAA),BBB,CCC);
+
+#else    // USSDUI_LOGGING_METHOD == 0 or invalid
+
+// Example: _LOGTEXT(own_desc);
+#define _LOGTEXT(AAA)              
+// Example: _LOGSTRING("Test");
+#define _LOGSTRING(AAA)            
+// Example: _LOGSTRING("Test %i", aValue);
+#define _LOGSTRING2(AAA,BBB)       
+// Example: _LOGSTRING("Test %i %i", aValue1, aValue2);
+#define _LOGSTRING3(AAA,BBB,CCC)   
+
+#endif // USSDUI_LOGGING_METHOD
+
+#endif // USSDLOGGER_H
+            
+// End of File
--- a/phoneuis/Ussd/inc/UssdNaviPane.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/Ussd/inc/UssdNaviPane.h	Mon Mar 15 12:40:24 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
+* 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"
@@ -22,6 +22,7 @@
 
 // INCLUDES
 #include <coecntrl.h>
+#include <peninputclient.h>
     
 
 // FORWARD DECLARATIONS
@@ -132,7 +133,8 @@
         // The navipane control container.
         CAknNavigationControlContainer*     iNaviPane;
         
-        
+        // Client for accessing pen editor (virtual keyboard)
+        RPeninputServer iPeninputServer;
 
     };
 
--- a/phoneuis/Ussd/src/UssdAppUi.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/Ussd/src/UssdAppUi.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -15,24 +15,22 @@
 *
 */
 
-
 // INCLUDE FILES
-#include "UssdAppUi.h"
-#include "UssdContainer.h"
-#include "UssdComms.h"
 #include <ussd.rsg>
 #include <avkon.rsg>
-#include "ussd.hrh"
 #include <eikmenub.h>
 #include <eikedwin.h>
 #include <avkon.hrh>
 #include <bldvariant.hrh>
 #include <featmgr.h>
-
 #include <AknDef.h>
 #include <hlplch.h>   // For HlpLauncher
 
-
+#include "UssdAppUi.h"
+#include "UssdContainer.h"
+#include "UssdComms.h"
+#include "ussd.hrh"
+#include "UssdLogger.h"
 // ============================ MEMBER FUNCTIONS ===============================
 
 // -----------------------------------------------------------------------------
@@ -41,11 +39,12 @@
 // -----------------------------------------------------------------------------
 void CUssdAppUi::ConstructL()
     {
+    _LOGSTRING( "CUssdAppUi::ConstructL =>" )
     // Sets up TLS, must be done before FeatureManager is used in USSD.
     FeatureManager::InitializeLibL();
 
     BaseConstructL(
-        EAknEnableSkin | EAknEnableMSK
+        EAknEnableSkin | EAknEnableMSK | EAknSingleClickCompatible
         );
 
     // Softkeys at start:
@@ -66,9 +65,9 @@
     iAppContainer->ConstructL( ClientRect() );
     AddToStackL( iAppContainer );
     iIsAddedToStack = ETrue;
+    _LOGSTRING( "CUssdAppUi::ConstructL <=" )
     }
 
-
 // -----------------------------------------------------------------------------
 // CUssdAppUi::~CUssdAppUi
 // Destructor
@@ -76,28 +75,29 @@
 // -----------------------------------------------------------------------------
 CUssdAppUi::~CUssdAppUi()
     {
+    _LOGSTRING( "CUssdAppUi::~CUssdAppUi =>" )
     if ( iIsAddedToStack )
         {
         RemoveFromStack( iAppContainer );
         }
 
     delete iAppContainer;
-    iAppContainer = NULL;
 
     delete iComms;
-    iComms = NULL;
 
     // Frees the TLS! Must be done after FeatureManager is used.
     FeatureManager::UnInitializeLib();
+    _LOGSTRING( "CUssdAppUi::~CUssdAppUi <=" )
     }
 
-
 // -----------------------------------------------------------------------------
 // CUssdAppUi::HandleCommandL
 // Handle commands from the user.
 // -----------------------------------------------------------------------------
 void CUssdAppUi::HandleCommandL( TInt aCommand )
     {
+    _LOGSTRING2( "CUssdAppUi::HandleCommandL =>, aCommand=%d", 
+    aCommand )
     switch ( aCommand )
         {
         case EAknCmdExit:
@@ -145,9 +145,9 @@
         default:
             break;
         }
+    _LOGSTRING( "CUssdAppUi::HandleCommandL <=" )
     }
 
-
 // -----------------------------------------------------------------------------
 // CUssdAppUi::HandleResourceChangeL
 // -----------------------------------------------------------------------------
@@ -167,6 +167,8 @@
 // -----------------------------------------------------------------------------
 void CUssdAppUi::HandleForegroundEventL( TBool aForeground )
     {
+    _LOGSTRING2( "CUssdAppUi::HandleForegroundEventL =>, aForeground=%d",
+    aForeground )
     if ( iComms )
         {
         if ( aForeground )
@@ -202,9 +204,9 @@
         }
     
     CAknAppUi::HandleForegroundEventL( aForeground );
+    _LOGSTRING( "CUssdAppUi::HandleForegroundEventL <=" )
     }
 
-
 // -----------------------------------------------------------------------------
 // CUssdAppUi::DynInitMenuPaneL
 // Set's Send option visible.
@@ -236,7 +238,6 @@
     // If help not defined, do nothing
     }
 
-
 // -----------------------------------------------------------------------------
 // CUssdAppUi::SetSofkeySendVisibleL
 // Sets Send softkey (in)visible.
--- a/phoneuis/Ussd/src/UssdContainer.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/Ussd/src/UssdContainer.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -18,26 +18,15 @@
 
 
 // INCLUDE FILES
-#include    "UssdComms.h"
-#include    "UssdNaviPane.h"
-#include    "UssdAppUi.h"
-#include    "UssdContainer.h"
-#include    "UssdEditorLines.h"
+
 #include    <ussd.rsg>
-#include    "UssdLayout.h"
 #include    <aknkeys.h>
-#include    "ussd.hrh"
 #include    <eikedwin.h>
 #include    <bldvariant.hrh>
 #include    <featmgr.h>
-
 #include    <centralrepository.h>
 #include    <telinternalcrkeys.h>
-#include    "telephonyvariant.hrh"
-
 #include <csxhelp/ussd.hlp.hrh>  // for help context
-#include    "UssdApp.h" // for applicationUID
-#include    <AknUtils.h>
 
 // For skinning.
 #include    <AknsBasicBackgroundControlContext.h>
@@ -45,7 +34,16 @@
 #include    <AknsUtils.h>
 #include    <txtglobl.h>
 
-
+#include    "telephonyvariant.hrh"
+#include    "UssdComms.h"
+#include    "UssdNaviPane.h"
+#include    "UssdAppUi.h"
+#include    "UssdContainer.h"
+#include    "UssdEditorLines.h"
+#include    "UssdLayout.h"
+#include    "ussd.hrh"
+#include    "UssdApp.h" // for applicationUID
+#include    "UssdLogger.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -67,6 +65,7 @@
 //
 void CUssdContainer::ConstructL( const TRect& aRect )
     {
+    _LOGSTRING( "CUssdContainer::ConstructL =>" )
     CreateWindowL();
 
     // Create background control context for skins.
@@ -100,12 +99,14 @@
     ActivateL();
 
     iEditor->SetFocus( ETrue );
+    _LOGSTRING( "CUssdContainer::ConstructL <=" )
     }
 
 
 // Destructor
 CUssdContainer::~CUssdContainer()
     {
+    _LOGSTRING( "CUssdContainer::~CUssdContainer =>" ) 
     delete iLines;
 
     AknsUtils::DeregisterControlPosition( iEditor );
@@ -113,6 +114,7 @@
     delete iNaviPaneHandler;
 
     delete iBgContext; // For skinning, can be deleted, NULL if not exist.
+    _LOGSTRING( "CUssdContainer::~CUssdContainer <=" )
     }
 
 // -----------------------------------------------------------------------------
@@ -288,6 +290,9 @@
 TKeyResponse CUssdContainer::OfferKeyEventL(
     const TKeyEvent& aKeyEvent, TEventCode aType )
     {
+    _LOGSTRING3(
+    "CUssdContainer::OfferKeyEventL =>,TKeyEvent::iCode=%d,TEventCode=%d",
+    aKeyEvent.iCode, aType )
     TKeyResponse response = EKeyWasNotConsumed;
 
     // Special key handling comes first.
@@ -335,7 +340,8 @@
             iAppUi.Cba()->SetCommandSetL( R_USSD_SOFTKEYS_OPTIONS_EXIT_OPTIONS );
             iAppUi.Cba()->DrawNow();
         }
-
+    _LOGSTRING2(
+    "CUssdContainer::OfferKeyEventL <=, response=%d", response )
     return response;
     }
 
@@ -482,6 +488,7 @@
 // ---------------------------------------------------------
 void CUssdContainer::UpdateNavipaneMsgLengthL()
     {
+    _LOGSTRING( "CUssdContainer::UpdateNavipaneMsgLengthL =>" )
 
     if ( iNaviPaneHandler )
         {
@@ -507,7 +514,7 @@
         iEditor->SetMaxLength( maxLen );
 
         }
-
+    _LOGSTRING( "CUssdContainer::UpdateNavipaneMsgLengthL <=" )
     }
 
 // End of File
--- a/phoneuis/Ussd/src/UssdEditorLines.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/Ussd/src/UssdEditorLines.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2002-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"
@@ -104,9 +104,9 @@
     {
     // Move rectangles to right position
     
-    for ( TInt i = 0;
-            i < iRects->Count() && i < UssdLayout::NumberOfEditorLines(); 
-            i++ )
+    for ( TInt i = 0; 
+          iRects && i < iRects->Count() && i < UssdLayout::NumberOfEditorLines(); 
+          i++ )
         {
         iRects->At( i )->LayoutRect( Rect() , 
             UssdLayout::MessageWritingLayoutElements6( i+1 ) );
@@ -151,7 +151,7 @@
     // Draw row lines by clearing rectangles corresponding to row locations.
     TInt count( iRects->Count() );
     TInt lines( UssdLayout::NumberOfEditorLines() );
-    for ( TInt i = 0; i < count && i < lines; i++ )
+    for ( TInt i = 0; iRects && i < count && i < lines; i++ )
         {
         gc.Clear( iRects->At( i )->Rect() );
         }
--- a/phoneuis/Ussd/src/UssdNaviPane.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/Ussd/src/UssdNaviPane.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
+* 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"
@@ -24,9 +24,9 @@
 #include    <AknIndicatorContainer.h>
 #include    <aknnavilabel.h>
 #include    "UssdComms.h" 
-
 #include    "UssdAppUi.h"
 #include    "UssdNaviPane.h"
+#include    "UssdLogger.h"
  
 #include <AknUtils.h>
 // CONSTANTS
@@ -82,9 +82,11 @@
 //
 void CUssdNaviPane::ConstructL()
     {
+    _LOGSTRING( "CUssdNaviPane::ConstructL =>" )
     
     CreateExtraNaviLabelL();
 
+    User::LeaveIfError( iPeninputServer.Connect() );
     iCharacterSetConverter = CCnvCharacterSetConverter::NewL();
 
     iCharacterSetConverter->PrepareToConvertToOrFromL(
@@ -93,7 +95,7 @@
 
     iCharacterSetConverter->SetDowngradeForExoticLineTerminatingCharacters(
         CCnvCharacterSetConverter::EDowngradeExoticLineTerminatingCharactersToJustLineFeed );
-
+    _LOGSTRING( "CUssdNaviPane::ConstructL <=" )
     }
 
 // -----------------------------------------------------------------------------
@@ -104,6 +106,8 @@
 //
 CUssdNaviPane::~CUssdNaviPane()
     {
+    _LOGSTRING( "CUssdNaviPane::~CUssdNaviPane =>" )
+    iPeninputServer.Close();
     
     if ( iNaviPane && iNaviDecorator )
         {
@@ -117,7 +121,7 @@
     iCharacterSetConverter = NULL;
 
     iNaviLabel = NULL;
-
+    _LOGSTRING( "CUssdNaviPane::~CUssdNaviPane <=" )
     }
   
 // ----------------------------------------------------
@@ -150,6 +154,8 @@
 TInt CUssdNaviPane::UpdateMsgLengthL( const TDesC& aInputString, 
                                              CCoeControl* aControl )
     {
+    _LOGSTRING2( "CUssdNaviPane::UpdateMsgLengthL =>, aInputString=%S",
+    &aInputString )
     TInt maxLen(0);
     const TInt txtLen = aInputString.Length();
  
@@ -196,7 +202,12 @@
         }
     
     iNaviLabel->SetTextL( *digitBuffer );
+    _LOGSTRING(
+    "CUssdNaviPane::UpdateMsgLengthL iPeninputServer.UpdateAppInfo" )
+    iPeninputServer.UpdateAppInfo( *digitBuffer, EAppIndicatorMsg );
     CleanupStack::PopAndDestroy( digitBuffer );
+    _LOGSTRING2( "CUssdNaviPane::UpdateMsgLengthL <=, maxLen=%d",
+    maxLen )
     
     return maxLen;
     }
@@ -210,6 +221,9 @@
 //
 TBool CUssdNaviPane::NeedsToBeSentAsUnicodeL( const TDesC& aInputString ) const
     {
+    _LOGSTRING2(
+    "CUssdNaviPane::NeedsToBeSentAsUnicodeL =>, aInputString=%S",
+    &aInputString )
     
     TBool needsToBeSentAsUnicode = EFalse;
       
@@ -255,6 +269,9 @@
         remainderOfInputString.Set( 
             remainderOfInputString.Right( returnValue ) );
         }
+    _LOGSTRING2(
+    "CUssdNaviPane::NeedsToBeSentAsUnicodeL <=, needsToBeSentAsUnicode=%d",
+    needsToBeSentAsUnicode )
     return needsToBeSentAsUnicode;
     }
 
--- a/phoneuis/dialer/src/cdialerkeypadcontainer.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/dialer/src/cdialerkeypadcontainer.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -423,7 +423,7 @@
         // Send key event to phone.
         TKeyEvent keyEvent;
         keyEvent.iScanCode = tappedButton->ScanCode();
-        keyEvent.iModifiers = 0;
+        keyEvent.iModifiers = ( EModifierNumLock | EModifierKeypad ); // Mark that this event is dialer simulated
         keyEvent.iRepeats = 0;  
              
         switch ( aEventType )
--- a/phoneuis/dialer/src/cdialertoolbarcontainer.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/dialer/src/cdialertoolbarcontainer.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -225,7 +225,12 @@
         // Revert this change as we do not want to use states
         // for "toggle button" type of functionality but to give one button
         // different functions depending on the situation.
+        // Must initiate button redraw so that the state change done here 
+        // is drawn too; the automatically changed state is drawn within 
+        // AknButton just before EEventStateChanged is reported 
+        // (in emulator button icon flashing can be seen).
         UpdateButtonStates();
+        aControl->DrawNow();
 
         // Handle the command attached to the button
         CAknButton* button = static_cast<CAknButton*>( aControl );
--- a/phoneuis/easydialing/inc/dialingextensioninterface.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/easydialing/inc/dialingextensioninterface.h	Mon Mar 15 12:40:24 2010 +0200
@@ -181,7 +181,7 @@
      * Tells if extension is currently enabled from settings.
      * @return  ETrue if extension is enabled, EFalse otherwise.
      */
-    virtual TBool IsEnabled() = 0;
+    virtual TBool IsEnabled() const = 0;
     
 private: // data
 
--- a/phoneuis/easydialing/inc/easydialingcenreplistener.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/easydialing/inc/easydialingcenreplistener.h	Mon Mar 15 12:40:24 2010 +0200
@@ -57,13 +57,13 @@
         * Gets the easydialing on/off cenrep key value
         * @return   The key value
         */
-        TInt Value();
+        TInt Value() const;
         
         /**
          * Sets the easydialing on/off cenrep key value
          * @param aValue Value to be set.
          */
-        void SetEasyDialingSettingsValue( const TInt aValue );        
+        void SetEasyDialingSettingsValue( const TInt aValue );
         
         /**
          * Handles cenrep notifications.
--- a/phoneuis/easydialing/inc/easydialingcontactdatamanager.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/easydialing/inc/easydialingcontactdatamanager.h	Mon Mar 15 12:40:24 2010 +0200
@@ -198,6 +198,13 @@
      */
     TNameOrder NameOrder();
 
+    /**
+     * Pause the loading of contact data. This is used to make sure listbox is responsive
+     * and smooth during panning and flicking.
+     * @param aPause Pause on/off
+     */
+    void Pause( TBool aPause );
+
 public:
     
     /**
@@ -344,6 +351,9 @@
     
     /** Contact name display order. */
     TNameOrder iNameOrder;
+    
+    /** Contact data manager pause status */
+    TBool iPause;
     };
 
 #endif //__EASYDIALINGTHUMBNAILMANAGER_H__
--- a/phoneuis/easydialing/inc/easydialinglistboxdata.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/easydialing/inc/easydialinglistboxdata.h	Mon Mar 15 12:40:24 2010 +0200
@@ -205,6 +205,9 @@
     /** Default image for contacts with no own thumbnail. Owned. */
     CGulIcon* iDummyThumbnail;
     
+    /** Favourite icon. Owned. */
+    CGulIcon* iFavouriteIcon;
+    
     /** Pointer to listbox. Not owned. */
     CEasyDialingListBox* iControl;
     };
--- a/phoneuis/easydialing/inc/easydialingplugin.h	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/easydialing/inc/easydialingplugin.h	Mon Mar 15 12:40:24 2010 +0200
@@ -209,7 +209,7 @@
      * Tells if extension is currently enabled from settings.
      * @return  ETrue if extension is enabled, EFalse otherwise.
      */
-    TBool IsEnabled();
+    TBool IsEnabled() const;
     
 public:
     
--- a/phoneuis/easydialing/src/easydialingcenreplistener.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/easydialing/src/easydialingcenreplistener.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -89,7 +89,7 @@
 // Returns key value
 // -----------------------------------------------------------------------------
 //
-TInt CEasyDialingCenrepListener::Value()
+TInt CEasyDialingCenrepListener::Value() const
     {
     return iEasyDialingSettingValue;
     }
--- a/phoneuis/easydialing/src/easydialingcontactdatamanager.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/easydialing/src/easydialingcontactdatamanager.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -186,7 +186,7 @@
     }
 
 // ---------------------------------------------------------------------------
-// CEasyDialingContactDataManager::GetThumbnail 
+// CEasyDialingContactDataManager::GetThumbnailAndFav 
 // ---------------------------------------------------------------------------
 //
 TBool CEasyDialingContactDataManager::GetThumbnailAndFav(const TDesC& aId, CFbsBitmap*& aThumbnail, TBool& aFav)
@@ -262,14 +262,13 @@
 //
 MVPbkContactLink* CEasyDialingContactDataManager::FavLinkLC( TInt aIndex )
     {
-    if ( iFavsView )
+    if ( !iFavsView )
         {
-        return iFavsView->ContactAtL( aIndex ).CreateLinkLC();
+        // LC function should not return normally unless it has actually
+        // put something to cleanup stack
+        User::Leave( KErrNotFound );
         }
-    else
-        {
-        return NULL;
-        }
+    return iFavsView->ContactAtL( aIndex ).CreateLinkLC();
     }
 
 // ---------------------------------------------------------------------------
@@ -326,6 +325,24 @@
     }
 
 // ---------------------------------------------------------------------------
+// CEasyDialingContactDataManager::Pause
+// ---------------------------------------------------------------------------
+//
+void CEasyDialingContactDataManager::Pause( TBool aPause )
+    {
+    iPause = aPause;
+    
+    if ( !iPause && iWaitingContacts.Count() )
+        {
+        TRAPD( err, LoadNextContactDataL());
+        if ( err )
+            {
+            HandleError(err);
+            }
+        }
+    }
+
+// ---------------------------------------------------------------------------
 // CEasyDialingContactDataManager::InitReady
 // ---------------------------------------------------------------------------
 //
@@ -372,7 +389,7 @@
 void CEasyDialingContactDataManager::LoadNextContactDataL()
     {
     LOGSTRING("CEasyDialingContactDataManager: LoadNextContactDataL");
-    if (!iImageOperation && !iContactOperation && iWaitingContacts.Count() && iStoreReady)
+    if ( !iImageOperation && !iContactOperation && iWaitingContacts.Count() && iStoreReady && !iPause )
         {
         // first we need to load the contact item
         CEasyDialingContactData* tn = iContactDataArray[iWaitingContacts[0]];
@@ -477,6 +494,7 @@
     iStoreContact = NULL;
     iWaitingContacts.Reset();
     iContactDataArray.ResetAndDestroy();
+    iPause = EFalse;
     }
 
 // ---------------------------------------------------------------------------
--- a/phoneuis/easydialing/src/easydialinglistbox.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/easydialing/src/easydialinglistbox.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -413,7 +413,6 @@
     }
 
 
-
 // -----------------------------------------------------------------------------
 // SetFocusedWithKeyEventL
 // -----------------------------------------------------------------------------
--- a/phoneuis/easydialing/src/easydialinglistboxdata.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/easydialing/src/easydialinglistboxdata.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -246,6 +246,7 @@
     delete iArrowPointingLeft;
     delete iColorBitmap;
     delete iDummyThumbnail;
+    delete iFavouriteIcon;
     
     iContactDataManager = NULL;
     }
@@ -333,7 +334,12 @@
     AknIconUtils::CreateIconL( bm, mask, KPhonebook2EceBitmapFile,
             EMbmPhonebook2eceQgn_prop_pb_thumb_unknown, EMbmPhonebook2eceQgn_prop_pb_thumb_unknown_mask );
     iDummyThumbnail = CGulIcon::NewL( bm, mask );
-
+    
+    // Create the favourite icon bitmap and mask
+    AknIconUtils::CreateIconL( bm, mask, KFavouriteIconBitmapFile, 
+            EMbmPhonebook2Qgn_prop_pb_topc, EMbmPhonebook2Qgn_prop_pb_topc_mask );
+    
+    iFavouriteIcon = CGulIcon::NewL( bm, mask );
     }
 
 
@@ -561,8 +567,6 @@
          TRect aNameRectUnMirrored,
          TRect aEffectiveRect) const
     {
-    CFbsBitmap* favouriteIcon;
-    CFbsBitmap* favouriteIconMask;
     TRect favouriteIconBoundingBox;
 
     favouriteIconBoundingBox = FavouriteIconBoundingBox( aNameRectUnMirrored );
@@ -582,14 +586,11 @@
         }
     else
         {
-        // Create the bitmap and mask to draw.
-        TRAP_IGNORE( AknIconUtils::CreateIconL(favouriteIcon, favouriteIconMask, KFavouriteIconBitmapFile, 
-                EMbmPhonebook2Qgn_prop_pb_topc, EMbmPhonebook2Qgn_prop_pb_topc_mask ));
-
         // Set size for the bitmap and mask
-        AknIconUtils::SetSize(favouriteIcon, favouriteIconBoundingBox.Size());
-        AknIconUtils::SetSize(favouriteIconMask, favouriteIconBoundingBox.Size());
-        aGc.BitBltMasked( favouriteIconBoundingBox.iTl , favouriteIcon, sourceRect, favouriteIconMask, ETrue);
+        AknIconUtils::SetSize( iFavouriteIcon->Bitmap(), favouriteIconBoundingBox.Size() );
+        AknIconUtils::SetSize( iFavouriteIcon->Mask(), favouriteIconBoundingBox.Size() );
+        aGc.BitBltMasked( favouriteIconBoundingBox.iTl , iFavouriteIcon->Bitmap(), 
+                sourceRect, iFavouriteIcon->Mask(), ETrue);
         }
     }
 // -----------------------------------------------------------------------------
@@ -699,7 +700,7 @@
     destinationGc->DrawRect( TRect( TPoint( 0,0 ), aSize ) );
 
     // Colorbitmap is ready, cleanup
-    delete destinationGc;    
+    delete destinationGc;
     CleanupStack::PopAndDestroy(destinationDevice); 
     }
 
@@ -739,7 +740,7 @@
             aItemRect.iTl.iX + leftMargin,
             aItemRect.iTl.iY + topMargin,
             aItemRect.iTl.iX + leftMargin + width,
-            aItemRect.iBr.iY - bottomMargin);  
+            aItemRect.iBr.iY - bottomMargin);
     }
 
 // -----------------------------------------------------------------------------
@@ -1036,11 +1037,11 @@
         {
         if ( aHighLight )
             {
-            aGc.SetPenColor( aColors.iHighlightedText );                 
+            aGc.SetPenColor( aColors.iHighlightedText );
             }
         else 
             {
-            aGc.SetPenColor( aColors.iText );                   
+            aGc.SetPenColor( aColors.iText );
             }
         }
     
--- a/phoneuis/easydialing/src/easydialinglistboxitemdrawer.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/easydialing/src/easydialinglistboxitemdrawer.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -26,8 +26,8 @@
 #include <aknlistloadertfx.h>
 #include <aknlistboxtfxinternal.h>
 #include <aknlistboxtfx.h>
-
 #include <akntransitionutils.h>
+#include <aknutils.h>
 
 // EXTERNAL DATA STRUCTURES
 
@@ -155,32 +155,15 @@
             aItemIsCurrent && highlightShown,
             colors );
     
-    //currently few themes doesnt support IsListSeperatorLines method therefore it is commented out
-    // for the time being in the below if loop
-    
-    if ( /*AknsDrawUtils::IsListSeperatorLines( AknsUtils::SkinInstance() ) &&*/ aItemTextRect.iTl.iY > iViewRect.iTl.iY )
+    if ( aItemTextRect.iBr.iY < iViewRect.iBr.iY && aItemIndex < iModel->NumberOfItems() - 1 )
         {
         if ( transApi )
             {
             transApi->StartDrawing( MAknListBoxTfxInternal::EListItem );
             }
+        
+        AknListUtils::DrawSeparator( *iGc, aItemTextRect, iTextColor );
 
-        TRgb lineColor;
-        TInt retVal = AknsUtils::GetCachedColor( AknsUtils::SkinInstance(), lineColor, KAknsIIDFsLineColors, 
-                EAknsCIFsLineColorsCG1);
-        // we are fetching lineColor from the skin.Incase, if there isn't any lineColor then we are using
-        //iMatchingBack as a backup line Color
-        if( retVal == KErrNone)
-            {
-            iGc->SetPenColor(lineColor);
-            }
-        else
-            {
-            iGc->SetPenColor(iMatchingBack);
-            }
-        iGc->SetPenStyle(CGraphicsContext::ESolidPen);
-        iGc->DrawLine( aItemTextRect.iTl, TPoint( aItemTextRect.iBr.iX, aItemTextRect.iTl.iY) );
-        
         if ( transApi )
             {
             transApi->StopDrawing();
--- a/phoneuis/easydialing/src/easydialingplugin.cpp	Fri Mar 12 15:42:40 2010 +0200
+++ b/phoneuis/easydialing/src/easydialingplugin.cpp	Mon Mar 15 12:40:24 2010 +0200
@@ -128,9 +128,11 @@
 
 static TBool IsItuTCharacter( TChar aChar );
 
-// FORWARD DECLARATIONS
+static TInt Find( const MVPbkContactLink* aLink, const RPointerArray<MVPbkContactLink>& aArray );
 
-using namespace AknLayoutScalable_Avkon;
+template <class T>
+inline void CleanupResetAndDestroyPushL(T& aRef);
+
 
 
 // -----------------------------------------------------------------------------
@@ -283,7 +285,7 @@
 
 
 // -----------------------------------------------------------------------------
-// Initialize
+// InitializeL
 // Initialises easy dialing.
 // -----------------------------------------------------------------------------
 //
@@ -410,7 +412,7 @@
     }
 
 // -----------------------------------------------------------------------------
-// GetContactFields
+// SetSortOrderL
 // -----------------------------------------------------------------------------
 //
 void CEasyDialingPlugin::SetSortOrderL( CEasyDialingContactDataManager::TNameOrder aNameOrder )
@@ -432,7 +434,7 @@
         fields.Append(R_VPBK_FIELD_TYPE_COMPANYNAME);
         }
     iPredictiveContactSearchHandler->ChangeSortOrderL( *iContactDataStores[0], fields );
-    CleanupStack::PopAndDestroy(); //fields
+    CleanupStack::PopAndDestroy( &fields );
     }
 
 // -----------------------------------------------------------------------------
@@ -712,6 +714,7 @@
                     {
                     // We get here if user e.g. leaves dialer open and goes to Contacts
                     // application and does some editing.
+                    iContactDataManager->Reload(); // to update thumbnails
                     AsyncActionLaunchL( ELaunchSearch );
                     }
                 }
@@ -847,7 +850,7 @@
         {
         return;
         }
-   
+    
     iDiscardCompletingSearches = EFalse;
     iNewSearchNeeded = EFalse;
     
@@ -893,7 +896,7 @@
 //
 void CEasyDialingPlugin::HandlePsResultsUpdate( RPointerArray<CPsClientData>& aResults, RPointerArray<CPsPattern>& aSeqs )
     {
-    if (iCenrepListener && iCenrepListener->Value() == 0)
+    if ( !IsEnabled() )
         {
         // Easydialing is off. We should arrive here only if user turned it off while a search was happening.
         Reset();
@@ -901,7 +904,7 @@
         }
     TRAPD( leaveError, HandlePsResultsUpdateL( aResults, aSeqs ) );
 
-    if( leaveError )
+    if ( leaveError )
         {
         OstTrace1( TRACE_ERROR, CEASYDIALINGPLUGIN_HANDLEPSRESULTSUPDATE, "HandlePsResultsUpdate failed: %d", leaveError );
         LOGSTRING1("EasyDialingPlugin: HandlePsResultsUpdate failed: %d", leaveError );
@@ -1007,61 +1010,92 @@
     OstTrace1( TRACE_NORMAL, CEASYDIALINGPLUGIN_HANDLEPSRESULTSUPDATEL_MATCHES, "Matching results from PCS: %d", numberOfPCSMatches );
     LOGSTRING1("EasyDialingPlugin: Matching results from PCS: %d", numberOfPCSMatches );
 
-    if ( numberOfPCSMatches > 0 )
-        {
-        // retrieve the name order before adding
-        CEasyDialingContactDataManager::TNameOrder nameOrder = iContactDataManager->NameOrder();
+    // retrieve the name order before adding
+    CEasyDialingContactDataManager::TNameOrder nameOrder = iContactDataManager->NameOrder();
 
-        // map results to old contact match data
-        for( TInt i = 0; i < numberOfPCSMatches; i++ )
-            {
-            TInt indexFromEnd = numberOfPCSMatches - i - 1;
+    RPointerArray<MVPbkContactLink> favsFoundByPcs;
+    CleanupResetAndDestroyPushL( favsFoundByPcs );
+    
+    // Update the model
+    // ----------------
+    for ( TInt i = 0; i < numberOfPCSMatches; i++ )
+        {
+        TInt indexFromEnd = numberOfPCSMatches - i - 1;
 
-            MVPbkContactLink* link = iPredictiveContactSearchHandler->ConvertToVpbkLinkLC(
-                    *(aResults[indexFromEnd]), *iContactManager );
-            if ( !iContactDataManager->IsFavL( link ) )
-                {
-                // handle favourites separately, in another loop
-                HBufC* contactString = CreateContactStringLC( aResults[ indexFromEnd ], nameOrder );
-                CreateListBoxContactStringL( *contactString, link, matchThumbnails, EFalse );
-                CleanupStack::PopAndDestroy( contactString );
-                }
+        MVPbkContactLink* link = iPredictiveContactSearchHandler->ConvertToVpbkLinkLC(
+                *(aResults[indexFromEnd]), *iContactManager );
+        if ( !iContactDataManager->IsFavL( link ) )
+            {
+            // handle favourites separately, in another loop
+            HBufC* contactString = CreateContactStringLC( aResults[ indexFromEnd ], nameOrder );
+            CreateListBoxContactStringL( *contactString, link, matchThumbnails, EFalse );
+            CleanupStack::PopAndDestroy( contactString );
             CleanupStack::PopAndDestroy( link );
-            
-            OstTraceExt2( TRACE_NORMAL, CEASYDIALINGPLUGIN_HANDLEPSRESULTSUPDATEL_SHOW_MATCH, "Contact #%d: '%S'", i+1, iContactStringCreationBuffer );
-            LOGSTRING2("EasyDialingPlugin: Contact #%d: '%S'", i+1, &iContactStringCreationBuffer );    
             }
+        else
+            {
+            // favourites are handled later
+            favsFoundByPcs.AppendL( link );
+            CleanupStack::Pop( link );
+            }
+        
+        OstTraceExt2( TRACE_NORMAL, CEASYDIALINGPLUGIN_HANDLEPSRESULTSUPDATEL_SHOW_MATCH, "Contact #%d: '%S'", i+1, iContactStringCreationBuffer );
+        LOGSTRING2( "EasyDialingPlugin: Contact #%d: '%S'", i+1, &iContactStringCreationBuffer );
+        }
 
-        TInt numberOfFavs( iContactDataManager->NumberOfFavsL() );
-        TBuf<KBufferMaxLen> results;
-        for ( TInt i = numberOfFavs - 1; i >= 0; i-- )
+    // Search synchronously through all the favourite contacts to ensure
+    // that all favourite matches are added to bottom even when number of mathces
+    // exceeds the maximum number set to PCS
+    TInt numberOfFavs( iContactDataManager->NumberOfFavsL() );
+    TBuf<KBufferMaxLen> results;
+    for ( TInt i = numberOfFavs - 1; i >= 0; i-- )
+        {
+        HBufC* favContactString = iContactDataManager->FavContactStringLC( i, nameOrder );
+        MVPbkContactLink* link = iContactDataManager->FavLinkLC( i );
+        
+        // Check if this fav contact was returned in aResults.
+        // It's at least theoretically possible that all matches in aResults
+        // are not matched when using LookupMatchL. PCS has completely separate logics
+        // for functions SearchL and LookupMatchL and especially with Chinese variant
+        // they may return different results.
+        TBool found = ( Find( link, favsFoundByPcs ) != KErrNotFound );
+        
+        // If this fav contact was not in aResults, then use LookupMatchL
+        // to check if this contact is still a match and was excluded from aResults
+        // because maximum number of results was exceeded.
+        if ( !found )
             {
-            // check if this fav matches the search
-            HBufC* favContactString = iContactDataManager->FavContactStringLC( i, nameOrder );
             results = KNullDesC;
             iPredictiveContactSearchHandler->LookupMatchL(
                     *iPredictiveSearchQuery, *favContactString, results );
-            if ( results.Length() > 0 )
-                {
-                // matches, add this fav to listbox.
-                MVPbkContactLink* link = iContactDataManager->FavLinkLC( i );
-                CreateListBoxContactStringL( *favContactString, link, matchThumbnails, ETrue );
-                CleanupStack::PopAndDestroy(); //link
-                }
-            CleanupStack::PopAndDestroy( favContactString );
+            found = ( results.Length() > 0 );
+            }
+
+        if ( found )
+            {
+            // matches, add this fav to listbox.
+            CreateListBoxContactStringL( *favContactString, link, matchThumbnails, ETrue );
             }
-        
-        iNumberOfNames = iListBoxModel->Count();
+
+        CleanupStack::PopAndDestroy(); // link
+        CleanupStack::PopAndDestroy( favContactString );
+        }
+    
+    CleanupStack::PopAndDestroy( &favsFoundByPcs ); // ResetAndDestroy
+    
+    // Update the view
+    // ---------------
+    iNumberOfNames = iListBoxModel->Count();
+    if ( iNumberOfNames )
+        {
         iContactListBox->SetRectToNumberOfItems( iNumberOfNames );
         iContactListBox->HandleItemAdditionL();
         // Scroll the list to bottom
         iContactListBox->ScrollToMakeItemVisible( iNumberOfNames-1 );
-
         iContactListBox->MakeVisible( ETrue );
         }
     else
         {
-        iNumberOfNames = 0;
         iContactListBox->MakeVisible( EFalse );
         }
 
@@ -1333,7 +1367,7 @@
         
         if ( iContactListBox->CurrentItemIndex() >= 0 ) 
             {
-            TInt index = iContactListBox->CurrentContactDataIndex(); 
+            TInt index = iContactListBox->CurrentContactDataIndex();
             
             voiceCall = iContactDataManager->VoiceCallAvailable( index );
             videoCall = iContactDataManager->VideoCallAvailable( index );
@@ -1413,7 +1447,7 @@
     
     TBool ret(EFalse);
     
-    switch( aCommand )
+    switch ( aCommand )
         {
         case EEasyDialingOpenContact:
             
@@ -1495,9 +1529,9 @@
 // Check if Easy dialing is enabled in the settings
 // -----------------------------------------------------------------------------
 //
-TBool CEasyDialingPlugin::IsEnabled()
+TBool CEasyDialingPlugin::IsEnabled() const
     {
-    return ( iCenrepListener->Value() != 0 );
+    return ( iCenrepListener && iCenrepListener->Value() != 0 );
     }
 
 // -----------------------------------------------------------------------------
@@ -1534,7 +1568,7 @@
     
     // This means that iInputBlocker is deleted by CAknInputBlock when
     // it's cancelled ( we get a callback where iInputBlocker is set to NULL).
-    iInputBlocker->SetCancelDelete( iInputBlocker );                         
+    iInputBlocker->SetCancelDelete( iInputBlocker );
     }
 
 // -----------------------------------------------------------------------------
@@ -1600,7 +1634,7 @@
     HBufC* fullName = AllocWithoutHighlightSeparatorsLC( fullNameSeparators );
     
     VPbkFieldTypeSelectorFactory::TVPbkContactActionTypeSelector selector( 
-            VPbkFieldTypeSelectorFactory::EEmptySelector );   
+            VPbkFieldTypeSelectorFactory::EEmptySelector );
     
     switch ( iActionToBeLaunched ) 
         {
@@ -1626,7 +1660,7 @@
                 selector = VPbkFieldTypeSelectorFactory::EVoiceCallSelector;
                 }
             
-            CleanupStack::PopAndDestroy( sPSettings );         
+            CleanupStack::PopAndDestroy( sPSettings );
             }
             break;
             
@@ -1693,6 +1727,18 @@
             AsyncActionLaunchL( ELaunchCurrentContact );
             break;
             
+        // Pause contact data manager when panning and flicking listbox.
+        // This ensures smooth and responsive listbox touch handling.
+        case EEventFlickStarted:
+        case EEventPanningStarted:
+            iContactDataManager->Pause( ETrue );
+            break;
+            
+        case EEventFlickStopped:
+        case EEventPanningStopped:
+            iContactDataManager->Pause( EFalse );
+            break;
+            
         // We are not interested about the other listbox events.
         default:
             break;
@@ -1930,5 +1976,42 @@
          aChar == TChar('+');
     }
 
+// -----------------------------------------------------------------------------
+// Find contact link pointing to the same contact as given link
+// -----------------------------------------------------------------------------
+//
+static TInt Find( const MVPbkContactLink* aLink, const RPointerArray<MVPbkContactLink>& aArray )
+    {
+    TInt idx = KErrNotFound;
+    for ( TInt i = 0 ; i < aArray.Count() ; ++i )
+        {
+        if ( aArray[i]->IsSame( *aLink ) )
+            {
+            idx = i;
+            i = aArray.Count();
+            }
+        }
+    return idx;
+    }
+
+// -----------------------------------------------------------------------------
+// CleanupStack helpers for item owning RPointerArrays (etc)
+// -----------------------------------------------------------------------------
+//
+template <class T>
+class CleanupResetAndDestroy
+    {
+public:
+    inline static void PushL( T& aRef )
+        { CleanupStack::PushL( TCleanupItem(&ResetAndDestroy,&aRef) ); }
+private:
+    inline static void ResetAndDestroy( TAny *aPtr )
+        { static_cast<T*>(aPtr)->ResetAndDestroy(); }
+    };
+
+template <class T>
+inline void CleanupResetAndDestroyPushL( T& aRef )
+    { CleanupResetAndDestroy<T>::PushL(aRef); }
+
 //  End of File