Bug 1077075 - Part 3: Add nsITelephonyCallback as a new parameter (IDL). r=aknow
authorBen Hsu <bhsu@mozilla.com>
Tue, 23 Dec 2014 23:39:00 -0500
changeset 247918 ae350b46932a368c6309699a1b6a1d5644e3ed20
parent 247917 bd47d8dc3111923e2aa098db2837588c1bb2ef2a
child 247919 935a274524336b744e15167cbb273ef395d4cbfa
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaknow
bugs1077075
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1077075 - Part 3: Add nsITelephonyCallback as a new parameter (IDL). r=aknow
dom/telephony/nsIGonkTelephonyService.idl
dom/telephony/nsITelephonyService.idl
--- a/dom/telephony/nsIGonkTelephonyService.idl
+++ b/dom/telephony/nsIGonkTelephonyService.idl
@@ -5,17 +5,17 @@
 
 #include "nsITelephonyService.idl"
 
 %{C++
 #define GONK_TELEPHONY_SERVICE_CONTRACTID \
         "@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);
 
   void notifyCallDisconnected(in unsigned long clientId, in jsval call);
 
   void notifyCallRing();
 
--- a/dom/telephony/nsITelephonyService.idl
+++ b/dom/telephony/nsITelephonyService.idl
@@ -246,17 +246,17 @@ interface nsITelephonyDialCallback : nsI
 #define TELEPHONY_SERVICE_CONTRACTID \
   "@mozilla.org/telephony/telephonyservice;1"
 %}
 
 /**
  * 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;
   const unsigned short CALL_STATE_DIALING = 1;
   const unsigned short CALL_STATE_ALERTING = 2;
   const unsigned short CALL_STATE_CONNECTING = 3;
   const unsigned short CALL_STATE_CONNECTED = 4;
   const unsigned short CALL_STATE_HOLDING = 5;
@@ -290,25 +290,35 @@ interface nsITelephonyService : nsISuppo
    */
   void enumerateCalls(in nsITelephonyListener listener);
 
   /**
    * Functionality for making and managing phone calls.
    */
   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);
   void hangUpConference(in unsigned long clientId,
                         in nsITelephonyCallback callback);
   void holdConference(in unsigned long clientId);
   void resumeConference(in unsigned long clientId);