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

equal deleted inserted replaced

-:3c221667e687
+:94dc1107e8b2
 #include "tphonecmdparamaudiooutput.h"
 #include "cphonesecuritymodeobserver.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()
 {
 }
 // -----------------------------------------------------------
 ShowNoteL( EPhoneEmergencyConnectWaitNote );
 UpdateSetupCbaL();
 }
 }
 break;
 case MEngineMonitor::EPEMessageColpNumberAvailable:
 //Don't show COLP note during emergency call.
 break;
 default:
 CPhoneGsmInCall::HandlePhoneEngineMessageL(
 aMessage, aCallId );
 break;
 {
 resourceId = EPhoneInCallNumberAcqCBA;
 }
 }
 else if ( iStateMachine->SecurityMode()->IsAutolockEnabled()
-	|| SimState() != EPESimUsable
+|| SimState() != EPESimUsable
-	|| iStartupInterrupted )
+|| iStartupInterrupted )
 {
 if ( TouchCallHandlingSupported() )
-	{
+{
 resourceId = EPhoneCallHandlingEmergencyInCallNoOptions;
 }
 else if ( audioOutput == EPEWiredAudioAccessory || IsSwivelClosed())
 {
 resourceId = EPhoneCallHandlingEmergencyNoOptionsNoIhfCBA;
 }
 else if ( UseHandsetEmergencyCBA( audioOutput ) )
 {
 resourceId = EPhoneCallHandlingEmergencyHandsetCBA;
 }
 else if ( ( audioOutput == EPEHandset )
-		&& ( btAvailable ) )
+&& ( btAvailable ) )
 {
 resourceId = EPhoneCallHandlingInCallBtaaCBA;
 }
 }
 default:
 {
 if ( TouchCallHandlingSupported() )
 {
 CPhoneGsmInCall::HandleKeyMessageL( aMessage, aCode );
 }
 else if ( !iStateMachine->SecurityMode()->IsAutolockEnabled()
-	&& SimState() == EPESimUsable )
+&& SimState() == EPESimUsable )
 {
 // do base operation
 CPhoneGsmInCall::HandleKeyMessageL( aMessage, aCode );
 }
 break;
 break;
 case EPhoneInCallCmdEndThisOutgoingCall:
 case EPhoneInCallCmdEndThisActiveCall:
 DisconnectEmergencyCallL();
+break;
+case EPhoneCmdUpdateEmergencyCba:
+UpdateInCallCbaL();
 break;
 default:
 commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
 break;
 void CPhoneEmergency::HandleKeyEventL(
 const TKeyEvent& aKeyEvent,
 TEventCode aEventCode )
 {
 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleKeyEventL( ) ");
 if ( TouchCallHandlingSupported() )
 {
 CPhoneState::HandleKeyEventL( aKeyEvent, aEventCode );
 }
 else
 {
-		 if ( iStateMachine->SecurityMode()->IsAutolockEnabled()
+if ( iStateMachine->SecurityMode()->IsAutolockEnabled()
-			&& CPhoneKeys::IsNumericKey( aKeyEvent, aEventCode ) )
+&& CPhoneKeys::IsNumericKey( aKeyEvent, aEventCode ) )
-			{
+{
-			// Send the key event to the phone engine
+// Send the key event to the phone engine
-			SendKeyEventL( aKeyEvent, aEventCode );
+SendKeyEventL( aKeyEvent, aEventCode );
-			}
+}
-		else
+else
-			{
+{
-			// Handle numeric keys when key events are received in idle state
+// Handle numeric keys when key events are received in idle state
-			CPhoneState::HandleKeyEventL( aKeyEvent, aEventCode );
+CPhoneState::HandleKeyEventL( aKeyEvent, aEventCode );
-			}
+}
 }
 }
 // -----------------------------------------------------------
 // CPhoneEmergency::SendKeyEventL
 TInt resourceId = EPhoneCallHandlingCallSetupCBA;
 const TPEAudioOutput audioOutput =
 iStateMachine->PhoneEngineInfo()->AudioOutput();
 if ( !( TouchCallHandlingSupported() )
-		&& iCallSetup && audioOutput != EPENotActive )
+&& iCallSetup && audioOutput != EPENotActive )
 {
 if ( audioOutput == EPELoudspeaker )
 {
 resourceId = EPhoneCallHandlingCallSetupToHandsetCBA;
 }
 // --------------------------------------------------------------
 // CPhoneEmergency::TouchCallHandlingSupported
 // --------------------------------------------------------------
 //
 TBool CPhoneEmergency::TouchCallHandlingSupported () const
-	{
+{
-	if ( FeatureManager::FeatureSupported ( KFeatureIdTouchCallHandling ) )
+if ( FeatureManager::FeatureSupported ( KFeatureIdTouchCallHandling ) )
-		{
+{
-		return ETrue;
+return ETrue;
-		}
+}
-	else
+else
-		{
+{
-		return EFalse;
+return EFalse;
-		}
+}
-	}
+}
 // --------------------------------------------------------------
 // CPhoneEmergency::UseEmergencyNoIhfCBA
 // --------------------------------------------------------------
 //
 TBool CPhoneEmergency::UseEmergencyNoIhfCBA( const TPEAudioOutput& aAudioOutput ) const
-	{
+{
-	if ( !( TouchCallHandlingSupported() )
+if ( !( TouchCallHandlingSupported() )
-		&& ( ( aAudioOutput == EPEWiredAudioAccessory ) || ( IsSwivelClosed() ) ) )
+&& ( ( aAudioOutput == EPEWiredAudioAccessory ) || ( IsSwivelClosed() ) ) )
-		{
+{
-		return ETrue;
+return ETrue;
-		}
+}
-	else
+else
-		{
+{
-		return EFalse;
+return EFalse;
-		}
+}
-	}
+}
 // --------------------------------------------------------------
 // CPhoneEmergency::UseHandsetEmergencyCBA
 // --------------------------------------------------------------
 //
 TBool CPhoneEmergency::UseHandsetEmergencyCBA( const TPEAudioOutput& aAudioOutput ) const
 {
-	if ( !( TouchCallHandlingSupported() )
+if ( !( TouchCallHandlingSupported() )
-		&& ( ( aAudioOutput == EPELoudspeaker ) || ( aAudioOutput == EPEBTAudioAccessory ) ) )
+&& ( ( aAudioOutput == EPELoudspeaker ) || ( aAudioOutput == EPEBTAudioAccessory ) ) )
-		{
+{
-		return ETrue;
+return ETrue;
-		}
+}
-	else
+else
-		{
+{
-		return EFalse;
+return EFalse;
-		}
+}
 }
 // --------------------------------------------------------------
 // CPhoneEmergency::HandlePhoneStartupL
 // --------------------------------------------------------------

branch	RCL_3
changeset 57	94dc1107e8b2
parent 39	b8d67d6176f5
child 58	40a3f856b14d