diff -r 630d2f34d719 -r 07a122eea281 telephonyserver/etelmultimode/DTsy/mmtsyphone.cpp --- a/telephonyserver/etelmultimode/DTsy/mmtsyphone.cpp Tue Aug 31 16:23:08 2010 +0300 +++ b/telephonyserver/etelmultimode/DTsy/mmtsyphone.cpp Wed Sep 01 12:40:21 2010 +0100 @@ -491,7 +491,6 @@ case EMobilePhoneSetCallForwardingStatus: case EMobilePhoneProgramFeatureCode: case EMobilePhoneTerminateAllCalls: - case EMobilePhoneTerminateActiveCalls: ret=KReqModeFlowControlObeyed; break; default: @@ -1553,9 +1552,6 @@ case EMobilePhoneTerminateAllCalls: return TerminateAllCalls(aTsyReqHandle); - - case EMobilePhoneTerminateActiveCalls: - return TerminateActiveCalls(aTsyReqHandle); case EMobilePhoneGetMailboxNumbers: return GetMailboxNumbers (aTsyReqHandle, aPackage.Des1n()); @@ -2139,8 +2135,6 @@ return NotifyAirTimeDurationChangeCancel(aTsyReqHandle); case EMobilePhoneTerminateAllCalls: return TerminateAllCallsCancel(aTsyReqHandle); - case EMobilePhoneTerminateActiveCalls: - return TerminateActiveCallsCancel(aTsyReqHandle); case EMobilePhoneNotifySendNetworkServiceRequest: return NotifySendNetworkServiceRequestCancel(aTsyReqHandle); case EMobilePhoneNotifyAllSendNetworkServiceRequest: @@ -6073,25 +6067,6 @@ return KErrNone; } -TInt CPhoneDMmTsy::TerminateActiveCalls(const TTsyReqHandle aTsyReqHandle) - { - LOGTEXT(_L8("CPhoneDMmTsy::TerminateActiveCalls called")); - if (!iTerminateActiveCalls++) - { - //Just return KErrNone - ReqCompleted(aTsyReqHandle,KErrNone); - } - return KErrNone; - } - -TInt CPhoneDMmTsy::TerminateActiveCallsCancel(const TTsyReqHandle aTsyReqHandle) - { - LOGTEXT(_L8("CPhoneDMmTsy::TerminateActiveCallsCancel called")); - RemoveDelayedReq(aTsyReqHandle); - ReqCompleted(aTsyReqHandle,KErrCancel); - return KErrNone; - } - TInt CPhoneDMmTsy::NotifySendNetworkServiceRequest(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneNotifySendSSOperation* aOperation, TDes8* aRequestComplete) { LOGTEXT(_L8("CPhoneDMmTsy::NotifySendNetworkServiceRequest called"));