equal
deleted
inserted
replaced
489 case EMobilePhoneStartDTMFTone: |
489 case EMobilePhoneStartDTMFTone: |
490 case EMobilePhoneContinueDTMFStringSending: |
490 case EMobilePhoneContinueDTMFStringSending: |
491 case EMobilePhoneSetCallForwardingStatus: |
491 case EMobilePhoneSetCallForwardingStatus: |
492 case EMobilePhoneProgramFeatureCode: |
492 case EMobilePhoneProgramFeatureCode: |
493 case EMobilePhoneTerminateAllCalls: |
493 case EMobilePhoneTerminateAllCalls: |
|
494 case EMobilePhoneTerminateActiveCalls: |
494 ret=KReqModeFlowControlObeyed; |
495 ret=KReqModeFlowControlObeyed; |
495 break; |
496 break; |
496 default: |
497 default: |
497 ret=CPhoneBase::ReqModeL(aIpc); |
498 ret=CPhoneBase::ReqModeL(aIpc); |
498 break; |
499 break; |
1550 aPackage.Des2u(), |
1551 aPackage.Des2u(), |
1551 REINTERPRET_CAST(RMobilePhone::TNetworkServiceAndAction*, dataPtr)); |
1552 REINTERPRET_CAST(RMobilePhone::TNetworkServiceAndAction*, dataPtr)); |
1552 |
1553 |
1553 case EMobilePhoneTerminateAllCalls: |
1554 case EMobilePhoneTerminateAllCalls: |
1554 return TerminateAllCalls(aTsyReqHandle); |
1555 return TerminateAllCalls(aTsyReqHandle); |
|
1556 |
|
1557 case EMobilePhoneTerminateActiveCalls: |
|
1558 return TerminateActiveCalls(aTsyReqHandle); |
1555 |
1559 |
1556 case EMobilePhoneGetMailboxNumbers: |
1560 case EMobilePhoneGetMailboxNumbers: |
1557 return GetMailboxNumbers (aTsyReqHandle, aPackage.Des1n()); |
1561 return GetMailboxNumbers (aTsyReqHandle, aPackage.Des1n()); |
1558 |
1562 |
1559 case EMobilePhoneSetMmsUserConnParams: |
1563 case EMobilePhoneSetMmsUserConnParams: |
2133 return NotifyAPNControlListServiceStatusChangeCancel(aTsyReqHandle); |
2137 return NotifyAPNControlListServiceStatusChangeCancel(aTsyReqHandle); |
2134 case EMobilePhoneNotifyAirTimeDurationChange: |
2138 case EMobilePhoneNotifyAirTimeDurationChange: |
2135 return NotifyAirTimeDurationChangeCancel(aTsyReqHandle); |
2139 return NotifyAirTimeDurationChangeCancel(aTsyReqHandle); |
2136 case EMobilePhoneTerminateAllCalls: |
2140 case EMobilePhoneTerminateAllCalls: |
2137 return TerminateAllCallsCancel(aTsyReqHandle); |
2141 return TerminateAllCallsCancel(aTsyReqHandle); |
|
2142 case EMobilePhoneTerminateActiveCalls: |
|
2143 return TerminateActiveCallsCancel(aTsyReqHandle); |
2138 case EMobilePhoneNotifySendNetworkServiceRequest: |
2144 case EMobilePhoneNotifySendNetworkServiceRequest: |
2139 return NotifySendNetworkServiceRequestCancel(aTsyReqHandle); |
2145 return NotifySendNetworkServiceRequestCancel(aTsyReqHandle); |
2140 case EMobilePhoneNotifyAllSendNetworkServiceRequest: |
2146 case EMobilePhoneNotifyAllSendNetworkServiceRequest: |
2141 return NotifyAllSendNetworkServiceRequestCancel(aTsyReqHandle); |
2147 return NotifyAllSendNetworkServiceRequestCancel(aTsyReqHandle); |
2142 case EMobilePhoneClearBlacklist: |
2148 case EMobilePhoneClearBlacklist: |
6065 RemoveDelayedReq(aTsyReqHandle); |
6071 RemoveDelayedReq(aTsyReqHandle); |
6066 ReqCompleted(aTsyReqHandle,KErrCancel); |
6072 ReqCompleted(aTsyReqHandle,KErrCancel); |
6067 return KErrNone; |
6073 return KErrNone; |
6068 } |
6074 } |
6069 |
6075 |
|
6076 TInt CPhoneDMmTsy::TerminateActiveCalls(const TTsyReqHandle aTsyReqHandle) |
|
6077 { |
|
6078 LOGTEXT(_L8("CPhoneDMmTsy::TerminateActiveCalls called")); |
|
6079 if (!iTerminateActiveCalls++) |
|
6080 { |
|
6081 //Just return KErrNone |
|
6082 ReqCompleted(aTsyReqHandle,KErrNone); |
|
6083 } |
|
6084 return KErrNone; |
|
6085 } |
|
6086 |
|
6087 TInt CPhoneDMmTsy::TerminateActiveCallsCancel(const TTsyReqHandle aTsyReqHandle) |
|
6088 { |
|
6089 LOGTEXT(_L8("CPhoneDMmTsy::TerminateActiveCallsCancel called")); |
|
6090 RemoveDelayedReq(aTsyReqHandle); |
|
6091 ReqCompleted(aTsyReqHandle,KErrCancel); |
|
6092 return KErrNone; |
|
6093 } |
|
6094 |
6070 TInt CPhoneDMmTsy::NotifySendNetworkServiceRequest(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneNotifySendSSOperation* aOperation, TDes8* aRequestComplete) |
6095 TInt CPhoneDMmTsy::NotifySendNetworkServiceRequest(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneNotifySendSSOperation* aOperation, TDes8* aRequestComplete) |
6071 { |
6096 { |
6072 LOGTEXT(_L8("CPhoneDMmTsy::NotifySendNetworkServiceRequest called")); |
6097 LOGTEXT(_L8("CPhoneDMmTsy::NotifySendNetworkServiceRequest called")); |
6073 if (!iNotifySendNetworkServiceRequest++) |
6098 if (!iNotifySendNetworkServiceRequest++) |
6074 { |
6099 { |