Backed out changeset d36a45163b69 (bug 1077075)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 29 Dec 2014 10:30:15 +0100
changeset 221478 dfcb16f2e984189bb6ae29ff4339777ac936a0a7
parent 221477 46a36152ca47fa7fc502d3e3afafe5768efe5dc6
child 221479 a66c84f06cfec5d4950641cf6cbb1450051355a1
push id53352
push usercbook@mozilla.com
push dateMon, 29 Dec 2014 15:17:49 +0000
treeherdermozilla-inbound@8530f5b7443b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1077075
milestone37.0a1
backs outd36a45163b69a1b3549c1b186b3d5302f9fdf247
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
Backed out changeset d36a45163b69 (bug 1077075)
dom/telephony/nsITelephonyService.idl
--- 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(8df8555a-8b3f-11e4-a113-b33f8d2b2e5e)]
+[scriptable, uuid(6fa2d94b-80ee-4085-b6a0-535811ba9bb6)]
 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,35 +290,25 @@ 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,
-                  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 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 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);