Bug 977085 - Remove nsIGonkTelephonyProvider::notifyCallError. r=hsinyi
authorSzu-Yu Chen [:aknow] <szchen@mozilla.com>
Tue, 22 Apr 2014 17:55:06 +0800
changeset 198048 9710ee1a02c516d419fdda9161314cd13fb9ce4e
parent 198047 955f7fad0d974b50200d373b12b78f5538a3dd68
child 198049 7f19a9a6127e1e6087c6edb558f7eab42338834f
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershsinyi
bugs977085
milestone31.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 977085 - Remove nsIGonkTelephonyProvider::notifyCallError. r=hsinyi
dom/telephony/gonk/TelephonyProvider.js
dom/telephony/nsIGonkTelephonyProvider.idl
--- a/dom/telephony/gonk/TelephonyProvider.js
+++ b/dom/telephony/gonk/TelephonyProvider.js
@@ -782,33 +782,27 @@ TelephonyProvider.prototype = {
                                                     aCall.number,
                                                     aCall.isActive,
                                                     aCall.isOutgoing,
                                                     aCall.isEmergency,
                                                     aCall.isConference,
                                                     aCall.isSwitchable,
                                                     aCall.isMergeable]);
     } else {
-      this.notifyCallError(aClientId, aCall.callIndex, aCall.failCause);
+      this._notifyAllListeners("notifyError",
+                               [aClientId, aCall.callIndex, aCall.failCause]);
     }
     delete this._currentCalls[aClientId][aCall.callIndex];
 
     if (manualConfStateChange) {
       this.notifyConferenceCallStateChanged(RIL.CALL_STATE_UNKNOWN);
     }
   },
 
   /**
-   * Handle call error.
-   */
-  notifyCallError: function(aClientId, aCallIndex, aErrorMsg) {
-    this._notifyAllListeners("notifyError", [aClientId, aCallIndex, aErrorMsg]);
-  },
-
-  /**
    * Handle an incoming call.
    *
    * Not much is known about this call at this point, but it's enough
    * to start bringing up the Phone app already.
    */
   notifyCallRing: function() {
     // We need to acquire a CPU wake lock to avoid the system falling into
     // the sleep mode when the RIL handles the incoming call.
--- a/dom/telephony/nsIGonkTelephonyProvider.idl
+++ b/dom/telephony/nsIGonkTelephonyProvider.idl
@@ -5,24 +5,21 @@
 
 #include "nsITelephonyProvider.idl"
 
 %{C++
 #define GONK_TELEPHONY_PROVIDER_CONTRACTID \
         "@mozilla.org/telephony/gonktelephonyprovider;1"
 %}
 
-[scriptable, uuid(5fdd720f-fbe8-46f5-b671-3bf3360013dd)]
+[scriptable, uuid(9d884482-90fc-4050-a4b1-1a370afe7a35)]
 interface nsIGonkTelephonyProvider : nsITelephonyProvider
 {
   void notifyCallDisconnected(in unsigned long clientId, in jsval call);
 
-  void notifyCallError(in unsigned long clientId, in long callIndex,
-                       in AString error);
-
   void notifyCallRing();
 
   void notifyCallStateChanged(in unsigned long clientId, in jsval call,
                               [optional] in boolean skipStateConversion);
 
   void notifyCdmaCallWaiting(in unsigned long clientId, in AString number);
 
   void notifySupplementaryService(in unsigned long clientId, in long callIndex,