From b0399ed4678986b73bc044ab8755486943153e5d Mon Sep 17 00:00:00 2001 From: Ben Hsu Date: Tue, 23 Dec 2014 23:39:00 -0500 Subject: [PATCH] Bug 1077075 - Part 3: Add nsITelephonyCallback as a new parameter (IDL). r=aknow --HG-- extra : histedit_source : cf70b0478658a9832d09972b0e2e9e670c5f4e2e --- dom/telephony/nsIGonkTelephonyService.idl | 2 +- dom/telephony/nsITelephonyService.idl | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dom/telephony/nsIGonkTelephonyService.idl b/dom/telephony/nsIGonkTelephonyService.idl index 269f8304ed1..249ddc79c4a 100644 --- a/dom/telephony/nsIGonkTelephonyService.idl +++ b/dom/telephony/nsIGonkTelephonyService.idl @@ -10,7 +10,7 @@ "@mozilla.org/telephony/gonktelephonyservice;1" %} -[scriptable, uuid(cbbe66d8-865b-11e4-94f1-ab441e55905b)] +[scriptable, uuid(aec05f05-0ca5-470b-8230-cdee0209eafd)] interface nsIGonkTelephonyService : nsITelephonyService { void notifyAudioStateChanged(in unsigned long clientId, in short state); diff --git a/dom/telephony/nsITelephonyService.idl b/dom/telephony/nsITelephonyService.idl index 64ccad85fee..42113d8fa01 100644 --- a/dom/telephony/nsITelephonyService.idl +++ b/dom/telephony/nsITelephonyService.idl @@ -251,7 +251,7 @@ interface nsITelephonyDialCallback : nsITelephonyCallback * XPCOM component (in the content process) that provides the telephony * information. */ -[scriptable, uuid(6fa2d94b-80ee-4085-b6a0-535811ba9bb6)] +[scriptable, uuid(fd797bcc-54e2-4e4a-9ec7-3b72862d0d78)] interface nsITelephonyService : nsISupports { const unsigned short CALL_STATE_UNKNOWN = 0; @@ -295,15 +295,25 @@ interface nsITelephonyService : nsISupports */ void dial(in unsigned long clientId, in DOMString number, in boolean isEmergency, in nsITelephonyDialCallback callback); - void hangUp(in unsigned long clientId, in unsigned long callIndex); void startTone(in unsigned long clientId, in DOMString dtmfChar); void stopTone(in unsigned long clientId); - void answerCall(in unsigned long clientId, in unsigned long callIndex); - void rejectCall(in unsigned long clientId, in unsigned long callIndex); - void holdCall(in unsigned long clientId, in unsigned long callIndex); - void resumeCall(in unsigned long clientId, in unsigned long callIndex); + void answerCall(in unsigned long clientId, + in unsigned long callIndex, + in nsITelephonyCallback callback); + void rejectCall(in unsigned long clientId, + in unsigned long callIndex, + in nsITelephonyCallback callback); + void hangUpCall(in unsigned long clientId, + in unsigned long callIndex, + in nsITelephonyCallback callback); + void holdCall(in unsigned long clientId, + in unsigned long callIndex, + in nsITelephonyCallback callback); + void resumeCall(in unsigned long clientId, + in unsigned long callIndex, + in nsITelephonyCallback callback); void conferenceCall(in unsigned long clientId); void separateCall(in unsigned long clientId, in unsigned long callIndex);