FCL/sf/app/phone: comparison phoneapp/phoneuistates/src/cphoneemergency.cpp

equal deleted inserted replaced

-:40a3f856b14d
+:41a7f70b3818
 #include "tphonecmdparamstring.h"
 #include "tphonecmdparaminteger.h"
 #include "tphonecmdparamboolean.h"
 #include "tphonecmdparamemergencycallheaderdata.h"
 #include "tphonecmdparamcallheaderdata.h"
+#include "tphonecmdparamkeycapture.h"
 #include "mphonestatemachine.h"
 #include "phonestatedefinitionsgsm.h"
 #include "phoneviewcommanddefinitions.h"
 #include "phoneui.hrh"
 #include "phonerssbase.h"
 #include "cphonemainresourceresolver.h"
 #include "phonelogger.h"
 #include "cphonepubsubproxy.h"
 #include "cphonekeys.h"
 #include "tphonecmdparamaudiooutput.h"
-#include "cphonesecuritymodeobserver.h"
+#include "phoneresourceids.h"
 // ================= MEMBER FUNCTIONS =======================
-// -----------------------------------------------------------
 // C++ default constructor can NOT contain any code, that
 // might leave.
-// -----------------------------------------------------------
 //
 CPhoneEmergency::CPhoneEmergency(
 MPhoneStateMachine* aStateMachine,
 MPhoneViewCommandHandle* aViewCommandHandle,
 MPhoneCustomization* aPhoneCustomization ) :
 // -----------------------------------------------------------
 // CPhoneEmergency::~CPhoneEmergency()
 // Destructor
 // (other items were commented in a header).
 // -----------------------------------------------------------
-//
 CPhoneEmergency::~CPhoneEmergency()
 {
 }
 // -----------------------------------------------------------
 case MEngineMonitor::EPEMessageSentDTMF:         // fall through
 case MEngineMonitor::EPEMessageDTMFSendingAborted:
 CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId );
 if ( iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) == EPEStateDialing )
 {
-TPhoneCmdParamBoolean isNoteVisible;
+UpdateSetupCbaL();
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsNoteVisible,
+}
-&isNoteVisible );
+break;
-if ( !isNoteVisible.Boolean() )
-{
-ShowNoteL( EPhoneEmergencyConnectWaitNote );
-UpdateSetupCbaL();
-}
-}
-break;
 case MEngineMonitor::EPEMessageColpNumberAvailable:
 //Don't show COLP note during emergency call.
 break;
 default:
 CPhoneGsmInCall::HandlePhoneEngineMessageL(
 aMessage, aCallId );
 break;
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
-if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
-{
-CloseDTMFEditorL();
-}
 if ( aCallId == KEmergencyCallId )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
-// Make sure that toolbar is not shown any more
-iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
 // Remove emergency connecting note if still there
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
-// Close menu bar, if it is displayed
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+TPhoneCmdParamKeyCapture captureParam;
+captureParam.SetKeyCode( EKeyNo );
+iViewCommandHandle->ExecuteCommand(
+EPhoneViewStopCapturingKey, &captureParam );
 const TBool isSimStateNotPresentWithSecurityMode = IsSimStateNotPresentWithSecurityModeEnabled();
 // Sim IS not ok when making emergency call from Pin query, no note
 if ( (!IsSimOk() && !iStartupInterrupted) || isSimStateNotPresentWithSecurityMode )
 {
 StartShowSecurityNoteL();
 }
 else
 {
-if ( !TopAppIsDisplayedL() || iStateMachine->SecurityMode()->IsAutolockEnabled() )
+if ( !TopAppIsDisplayedL() || iDeviceLockOn  )
 {
 // Continue displaying current app but set up the
 // idle screen in the background
 SetupIdleScreenInBackgroundL();
-// Update toolbar
-iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateToolbar );
 }
 else if ( iOnScreenDialer && IsNumberEntryContentStored() )
 {
-if ( !IsNumberEntryUsedL() )
-{
-CreateNumberEntryL();
-}
-// Restore the number entry content from cache
-RestoreNumberEntryContentL();
 SetNumberEntryVisibilityL(ETrue);
 }
 else if ( IsNumberEntryUsedL() )
 {
 // Show the number entry if it exists
 SetNumberEntryVisibilityL(ETrue);
-// Update toolbar
-iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateToolbar );
 }
 else
 {
 // Display idle screen
 {
 if ( !isSimStateNotPresentWithSecurityMode )
 {
 SetDefaultFlagsL();
 }
 // As long as security note is not shown with feature flag
 // KFeatureIdFfSimlessOfflineSupport undef it is ok to do SetupIdleScreenInBackgroundL.
 if ( ( !IsNumberEntryUsedL() ) &&
 !( IsSimStateNotPresentWithSecurityModeEnabled() &&
 !FeatureManager::FeatureSupported( KFeatureIdFfSimlessOfflineSupport ) ) )
 {
 UpdateCbaL( EPhoneEmptyCBA );
-if ( !iStateMachine->SecurityMode()->IsSecurityMode() )
+TPhoneCmdParamBoolean securityMode;
+iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &securityMode );
+if ( !securityMode.Boolean() )
 {
 // Setup idle as next active app.
 SetupIdleScreenInBackgroundL();
 }
 }
 iStateMachine->ChangeState( EPhoneStateIdle );
 }
 }
 else
 {
 // because PE messages are processed asynchronously.
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleDialingL() ");
 if ( aCallId == KPEEmergencyCallId )
 {
-if ( !IsSimOk() || IsSimStateNotPresentWithSecurityModeEnabled() )
-{
+iDeviceLockOn = IsAutoLockOn();
-TPhoneCmdParamBoolean visibleMode;
-visibleMode.SetBoolean( ETrue );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetStatusPaneVisible, &visibleMode );
-}
-// Close menu bar, if it is displayed
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
-// Dim toolbar items
-SetToolbarDimming( ETrue );
-// Request that dimmed toolbar is visible.
-// Do it already here. Otherwice a white/black toolbar area is shortly shown and
-// a white screen can be a result when touching it.
-iViewCommandHandle->HandleCommandL( EPhoneViewShowToolbar );
 // Disable global notes when the phone is dialling
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
+TPhoneCmdParamKeyCapture captureParam;
+captureParam.SetKeyCode( EKeyNo );
+iViewCommandHandle->ExecuteCommand( EPhoneViewStartCapturingKey, &captureParam );
 // Capture keys when the phone is dialling
 CaptureKeysDuringCallNotificationL( ETrue );
 // Indicate that the Phone needs to be sent to the background if
 // an application other than the top application is in the foreground
-SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() );
+TPhoneCmdParamBoolean booleanParam;
+booleanParam.SetBoolean( !TopAppIsDisplayedL() );
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewSetNeedToSendToBackgroundStatus,
+&booleanParam );
 // Bring Phone app in the foreground
 TPhoneCmdParamInteger uidParam;
 uidParam.SetInteger( KUidPhoneApplication.iUid );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
 &uidParam );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 }
 // Remove exit emergency mode query, if it exists
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveQuery );
-// Enable the volume display
+BeginUiUpdateLC();
-iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume );
+TPhoneCmdParamEmergencyCallHeaderData emergencyHeaderParam;
+// Set call header
+TBuf<KPhoneCallHeaderLabelMaxLength> headerText( KNullDesC );
+StringLoader::Load(
+headerText,
+CPhoneMainResourceResolver::Instance()->ResolveResourceID(
+EPhoneEmergencyCallHeader ),
+CCoeEnv::Static() );
+emergencyHeaderParam.SetHeaderText( headerText );
+// Set call header ciphering status
+emergencyHeaderParam.SetCiphering(
+iStateMachine->PhoneEngineInfo()->IsSecureCall( aCallId ) );
+emergencyHeaderParam.SetCipheringIndicatorAllowed(
+iStateMachine->PhoneEngineInfo()->SecureSpecified() );
+// Notify the view
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewCreateEmergencyCallHeader,
+aCallId,
+&emergencyHeaderParam );
+TPhoneCmdParamCallHeaderData headerParam;
+headerParam.SetCallState( EPEStateDialing );
+StringLoader::Load(
+headerText,
+CPhoneMainResourceResolver::Instance()->ResolveResourceID(
+EPhoneAttemptingEmergencyText ),
+CCoeEnv::Static() );
+headerParam.SetLabelText( headerText );
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewUpdateBubble,
+aCallId,
+&headerParam );
 SetTouchPaneButtons( EPhoneEmergencyCallButtons );
+SetBackButtonActive(EFalse);
-ShowNoteL( EPhoneEmergencyConnectWaitNote );
+EndUiUpdate();
+// ShowNoteL( EPhoneEmergencyConnectWaitNote );
 UpdateSetupCbaL();
 }
 }
 // -----------------------------------------------------------
 // CPhoneEmergency::HandleConnectingL
 {
 // Stop capturing keys
 CaptureKeysDuringCallNotificationL( EFalse );
 }
 }
-else if ( !iStateMachine->SecurityMode()->IsAutolockEnabled() && SimState() == EPESimUsable )
+else if ( !iDeviceLockOn && SimState() == EPESimUsable )
 {
 // Stop capturing keys
 CaptureKeysDuringCallNotificationL( EFalse );
 }
+// Keep Phone in the foreground
+TPhoneCmdParamBoolean booleanParam;
+booleanParam.SetBoolean( EFalse );
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
 // Remove emergency connecting note
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
-TPhoneCmdParamEmergencyCallHeaderData emergencyHeaderParam;
-// Set call header
-TBuf<KPhoneCallHeaderLabelMaxLength> headerText( KNullDesC );
-StringLoader::Load(
-headerText,
-CPhoneMainResourceResolver::Instance()->ResolveResourceID(
-EPhoneEmergencyCallHeader ),
-CCoeEnv::Static() );
-emergencyHeaderParam.SetHeaderText( headerText );
-// Set call header ciphering status
-emergencyHeaderParam.SetCiphering(
-iStateMachine->PhoneEngineInfo()->IsSecureCall( aCallId ) );
-emergencyHeaderParam.SetCipheringIndicatorAllowed(
-iStateMachine->PhoneEngineInfo()->SecureSpecified() );
-BeginUiUpdateLC();
-// Notify the view
-iViewCommandHandle->ExecuteCommandL(
-EPhoneViewCreateEmergencyCallHeader,
-aCallId,
-&emergencyHeaderParam );
 TPhoneCmdParamCallHeaderData headerParam;
 headerParam.SetCallState( EPEStateConnecting );
 // Notify the view
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewUpdateBubble,
 aCallId,
 &headerParam );
-EndUiUpdate();
+SetToolbarButtonLoudspeakerEnabled();
 UpdateInCallCbaL();
 }
 // -----------------------------------------------------------
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewUpdateBubble,
 aCallId,
 &emergencyHeaderParam );
+SetBackButtonActive(ETrue);
 EndUiUpdate();
-SetToolbarDimming( ETrue );
 UpdateInCallCbaL();
 }
-// -----------------------------------------------------------
-// CPhoneEmergency::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneEmergency::OpenMenuBarL()
-{
-__LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::OpenMenuBarL() ");
-TInt resourceId;
-if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
-{
-resourceId = EPhoneDtmfDialerMenubar;
-}
-else if ( IsNumberEntryVisibleL() )
-{
-resourceId = EPhoneCallHandlingEmergencyMenubarWithNumberEntry;
-}
-else
-{
-resourceId = EPhoneCallHandlingEmergencyMenubar;
-}
-TPhoneCmdParamInteger integerParam;
-integerParam.SetInteger(
-CPhoneMainResourceResolver::Instance()->
-ResolveResourceID( resourceId ) );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
-&integerParam );
-}
 // -----------------------------------------------------------
 // CPhoneEmergency::UpdateInCallCbaL
 // -----------------------------------------------------------
 //
 void CPhoneEmergency::UpdateInCallCbaL()
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::UpdateInCallCbaL() ");
 TInt resourceId = EPhoneCallHandlingEmergencyCBA;
-const TPEAudioOutput audioOutput =
-iStateMachine->PhoneEngineInfo()->AudioOutput();
-const TBool btAvailable =
-iStateMachine->PhoneEngineInfo()->AudioOutputAvailable( EPEBTAudioAccessory );
-__PHONELOG2( EOnlyFatal, EPhoneUIStates,
-"CPhoneEmergency - AudioOutput: %d, BTAvailable: %d",
-audioOutput, btAvailable );
-if ( IsNumberEntryVisibleL() )
-{
-if ( IsDTMFEditorVisibleL() )
-{
-resourceId = EPhoneDtmfDialerCBA;
-}
-else
-{
-resourceId = EPhoneInCallNumberAcqCBA;
-}
-}
-else if ( iStateMachine->SecurityMode()->IsAutolockEnabled()
-|| SimState() != EPESimUsable
-|| iStartupInterrupted )
-{
-if ( TouchCallHandlingSupported() )
-{
-resourceId = EPhoneCallHandlingEmergencyInCallNoOptions;
-}
-else if ( audioOutput == EPEWiredAudioAccessory || IsSwivelClosed())
-{
-resourceId = EPhoneCallHandlingEmergencyNoOptionsNoIhfCBA;
-}
-else if ( audioOutput == EPELoudspeaker )
-{
-resourceId = EPhoneCallHandlingEmergencyNoOptionsHandsetCBA;
-}
-else
-{
-resourceId = EPhoneCallHandlingEmergencyNoOptionsCBA;
-}
-}
-else
-{
-if ( UseEmergencyNoIhfCBA( audioOutput ) )
-{
-resourceId = EPhoneCallHandlingEmergencyNoIhfCBA;
-}
-else if ( UseHandsetEmergencyCBA( audioOutput ) )
-{
-resourceId = EPhoneCallHandlingEmergencyHandsetCBA;
-}
-else if ( ( audioOutput == EPEHandset )
-&& ( btAvailable ) )
-{
-resourceId = EPhoneCallHandlingInCallBtaaCBA;
-}
-}
 iCbaManager->SetCbaL( resourceId );
 }
 // --------------------------------------------------------------
 // CPhoneEmergency::HandleKeyMessageL
 switch ( aCode )
 {
 // end-key
 case EKeyNo:
 // handle end key
-if ( iOnScreenDialer && IsDTMFEditorVisibleL() )
-{
-CloseDTMFEditorL();
-}
 DisconnectEmergencyCallL();
 break;
 // send-key
 case EKeyYes:
 &numberEntryCountParam );
 TInt neLength( numberEntryCountParam.Integer() );
 if ( neLength )
 {
 // Show not allowed note
-SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed );
+SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed, ETrue );
 }
 else
 {
 // Logs to open
 CallFromNumberEntryL();
 }
 }
 else
 {
 // Show not allowed note
-SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed );
+SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed, ETrue );
 }
 break;
 default:
 {
 if ( TouchCallHandlingSupported() )
 {
 CPhoneGsmInCall::HandleKeyMessageL( aMessage, aCode );
 }
-else if ( !iStateMachine->SecurityMode()->IsAutolockEnabled()
+else if ( !iDeviceLockOn && SimState() == EPESimUsable )
-&& SimState() == EPESimUsable )
 {
 // do base operation
 CPhoneGsmInCall::HandleKeyMessageL( aMessage, aCode );
 }
 break;
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleCommandL()");
 TBool commandStatus = ETrue;
 switch( aCommand )
 {
+case EPhoneInCallCmdDtmfManualQuery:
+if ( iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) == EPEStateDialing )
+{
+// Remove emergency connecting note
+iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
+}
+commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
+break;
 case EPhoneDtmfDialerExit:      // fall through
 case EPhoneDtmfDialerCancel:
 {
 if ( iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) == EPEStateDialing )
 {
-CloseDTMFEditorL();
+UpdateSetupCbaL();
-TPhoneCmdParamBoolean isNoteVisible;
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsNoteVisible,
-&isNoteVisible );
-if ( !isNoteVisible.Boolean() )
-{
-ShowNoteL( EPhoneEmergencyConnectWaitNote );
-UpdateSetupCbaL();
-}
 }
 else
 {
 commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
 }
 break;
 case EPhoneInCallCmdEndThisOutgoingCall:
 case EPhoneInCallCmdEndThisActiveCall:
 DisconnectEmergencyCallL();
-break;
-case EPhoneCmdUpdateEmergencyCba:
-UpdateInCallCbaL();
 break;
 default:
 commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
 break;
 case ECCPErrorConnectionError:
 case ECCPErrorCCIncompatibleMessageInProtocolState:
 case ECCPErrorCCNoChannelAvailable:
 case ECCPErrorNetworkBusy:
 case ECCPEmergencyFailed:
-SendGlobalErrorNoteL( EPhoneNoteNoNetworkCallEmergency );
+SendGlobalErrorNoteL( EPhoneNoteNoNetworkCallEmergency, ETrue );
 break;
 default:
 __PHONELOG1(
 EOnlyFatal,
 void CPhoneEmergency::HandleKeyEventL(
 const TKeyEvent& aKeyEvent,
 TEventCode aEventCode )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleKeyEventL( ) ");
 if ( TouchCallHandlingSupported() )
 {
 CPhoneState::HandleKeyEventL( aKeyEvent, aEventCode );
 }
 else
 {
-if ( iStateMachine->SecurityMode()->IsAutolockEnabled()
+if ( iDeviceLockOn && CPhoneKeys::IsNumericKey( aKeyEvent, aEventCode ) )
-&& CPhoneKeys::IsNumericKey( aKeyEvent, aEventCode ) )
 {
 // Send the key event to the phone engine
 SendKeyEventL( aKeyEvent, aEventCode );
 }
 else
 // Output
 const TPEAudioOutput audioOutput =
 iStateMachine->PhoneEngineInfo()->AudioOutput();
 UpdateSetupCbaL();
+SetTouchPaneButtons(0);
 // view update
 outputParam.SetAudioOutput( audioOutput );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewActivateAudioPathUIChanges,
 &outputParam );
 // -----------------------------------------------------------
 //
 void CPhoneEmergency::UpdateSetupCbaL()
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::UpdateSetupCbaL() ");
+TInt resourceId = EPhoneCallHandlingEmergencyCBA;
-TInt resourceId = EPhoneCallHandlingCallSetupCBA;
+iCbaManager->SetCbaL( resourceId );
+}
-const TPEAudioOutput audioOutput =
-iStateMachine->PhoneEngineInfo()->AudioOutput();
-if ( !( TouchCallHandlingSupported() )
-&& iCallSetup && audioOutput != EPENotActive )
-{
-if ( audioOutput == EPELoudspeaker )
-{
-resourceId = EPhoneCallHandlingCallSetupToHandsetCBA;
-}
-else if ( audioOutput == EPEHandset )
-{
-resourceId =  EPhoneCallHandlingCallSetupToIhfCBA;
-}
-else
-{
-resourceId = EPhoneCallHandlingCallSetupCBA;
-}
-TPhoneCmdParamInteger integerParam;
-integerParam.SetInteger(
-CPhoneMainResourceResolver::Instance()->
-ResolveResourceID( resourceId ) );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateNoteSoftkeys,
-&integerParam );
-}
-}
-// ---------------------------------------------------------
-// CPhoneEmergency::HandleCreateNumberEntryL
-//
-// ---------------------------------------------------------
-//
-void CPhoneEmergency::HandleCreateNumberEntryL( const TKeyEvent& aKeyEvent,
-TEventCode aEventCode )
-{
-__LOGMETHODSTARTEND( EPhoneControl, "CPhoneEmergency::HandleCreateNumberEntryL() ");
-if ( !iCallSetup && !iStartupInterrupted )
-{
-CPhoneGsmInCall::HandleCreateNumberEntryL( aKeyEvent, aEventCode );
-}
-}
 // -----------------------------------------------------------------------------
 // CPhoneEmergency::HandleRemConCommandL
 // -----------------------------------------------------------------------------
 //
 TRemConCoreApiButtonAction aButtonAct )
 {
 TBool handled = EFalse;
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneEmergency::MrccatoCommand() ");
 switch ( aOperationId )
 {
 case ERemConCoreApiMute:
 __PHONELOG( EBasic, EPhoneControl, "CPhoneEmergency::MrccatoCommand emerg. call no muting" );
 // Not Allowed
 {
 if ( FeatureManager::FeatureSupported ( KFeatureIdTouchCallHandling ) )
 {
 return ETrue;
 }
 else
 {
 return EFalse;
 }
 }
 // CPhoneEmergency::UseEmergencyNoIhfCBA
 // --------------------------------------------------------------
 //
 TBool CPhoneEmergency::UseEmergencyNoIhfCBA( const TPEAudioOutput& aAudioOutput ) const
 {
 if ( !( TouchCallHandlingSupported() )
 && ( ( aAudioOutput == EPEWiredAudioAccessory ) || ( IsSwivelClosed() ) ) )
 {
 return ETrue;
 }
 else
 {
 return EFalse;
 }
 }
 // --------------------------------------------------------------
 // CPhoneEmergency::UseHandsetEmergencyCBA
 // --------------------------------------------------------------
 //
 TBool CPhoneEmergency::UseHandsetEmergencyCBA( const TPEAudioOutput& aAudioOutput ) const
 {
 if ( !( TouchCallHandlingSupported() )
 && ( ( aAudioOutput == EPELoudspeaker ) || ( aAudioOutput == EPEBTAudioAccessory ) ) )
 {
 return ETrue;
 }
 else
 {
 return EFalse;
 }
 }
-// --------------------------------------------------------------
-// CPhoneEmergency::HandlePhoneStartupL
-// --------------------------------------------------------------
-//
-void CPhoneEmergency::HandlePhoneStartupL()
-{
-__LOGMETHODSTARTEND(EPhoneControl, "CPhoneEmergency::HandlePhoneStartupL( ) ");
-iStartupInterrupted = EFalse;
-}
 // End of File

branch	RCL_3
changeset 61	41a7f70b3818
parent 58	40a3f856b14d
child 62	5266b1f337bd