Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1115758 - Part 4: Add nsITelephonyService.cancelUSSD (ipc). r=hsinyi

Browse Source
This commit is contained in:
Szu-Yu Chen [:aknow] 2015-01-07 15:28:44 +08:00
parent 1ebde2ee7a
commit d4236ab32b
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/telephony/ipc/PTelephony.ipdl
View File

@ -24,12 +24,17 @@ struct DialRequest
bool isEmergency;
};
struct USSDRequest
struct SendUSSDRequest
{
uint32_t clientId;
nsString ussd;
};
struct CancelUSSDRequest
{
uint32_t clientId;
};
struct HangUpConferenceRequest
{
uint32_t clientId;
@ -69,7 +74,8 @@ union IPCTelephonyRequest
{
EnumerateCallsRequest;
DialRequest;
USSDRequest;
SendUSSDRequest;
CancelUSSDRequest;
HangUpConferenceRequest;
AnswerCallRequest;
HangUpCallRequest;

9
dom/telephony/ipc/TelephonyIPCService.cpp
View File

@ -314,7 +314,14 @@ TelephonyIPCService::SendUSSD(uint32_t aClientId, const nsAString& aUssd,
nsITelephonyCallback *aCallback)
{
return SendRequest(nullptr, aCallback,
USSDRequest(aClientId, nsString(aUssd)));
SendUSSDRequest(aClientId, nsString(aUssd)));
}
NS_IMETHODIMP
TelephonyIPCService::CancelUSSD(uint32_t aClientId,
nsITelephonyCallback *aCallback)
{
return SendRequest(nullptr, aCallback, CancelUSSDRequest(aClientId));
}
NS_IMETHODIMP

10
dom/telephony/ipc/TelephonyParent.cpp
View File

@ -60,12 +60,18 @@ TelephonyParent::RecvPTelephonyRequestConstructor(PTelephonyRequestParent* aActo
return true;
}
case IPCTelephonyRequest::TUSSDRequest: {
const USSDRequest& request = aRequest.get_USSDRequest();
case IPCTelephonyRequest::TSendUSSDRequest: {
const SendUSSDRequest& request = aRequest.get_SendUSSDRequest();
service->SendUSSD(request.clientId(), request.ussd(), actor);
return true;
}
case IPCTelephonyRequest::TCancelUSSDRequest: {
const CancelUSSDRequest& request = aRequest.get_CancelUSSDRequest();
service->CancelUSSD(request.clientId(), actor);
return true;
}
case IPCTelephonyRequest::THangUpConferenceRequest: {
const HangUpConferenceRequest& request = aRequest.get_HangUpConferenceRequest();
service->HangUpConference(request.clientId(), actor);