Bug 735165 - B2G RIL: Change nsIRadioInterfaceLayer::CALL_STATE_RINGING to CALL_STATE_ALERTING for consistency. r=philikon

dom/system/gonk/RadioInterfaceLayer.js

@@ -82,7 +82,7 @@ function convertRILCallState(state) {
     case RIL.CALL_STATE_DIALING:
       return nsIRadioInterfaceLayer.CALL_STATE_DIALING;
     case RIL.CALL_STATE_ALERTING:
-      return nsIRadioInterfaceLayer.CALL_STATE_RINGING;
+      return nsIRadioInterfaceLayer.CALL_STATE_ALERTING;
     case RIL.CALL_STATE_INCOMING:
       return nsIRadioInterfaceLayer.CALL_STATE_INCOMING;
     case RIL.CALL_STATE_WAITING:
@@ -354,7 +354,7 @@ RadioInterfaceLayer.prototype = {
     debug("handleCallStateChange: " + JSON.stringify(call));
     call.state = convertRILCallState(call.state);
     if (call.state == nsIRadioInterfaceLayer.CALL_STATE_DIALING ||
-        call.state == nsIRadioInterfaceLayer.CALL_STATE_RINGING ||
+        call.state == nsIRadioInterfaceLayer.CALL_STATE_ALERTING ||
         call.state == nsIRadioInterfaceLayer.CALL_STATE_CONNECTED) {
       // This is now the active call.
       this._activeCall = call;

dom/system/gonk/nsIRadioInterfaceLayer.idl

@@ -116,12 +116,12 @@ interface nsIRILDataCallback : nsISupports
                            in unsigned long length);
 };
 
-[scriptable, uuid(78fc7ef6-0941-4fc8-89ff-de9398ef478a)]
+[scriptable, uuid(7a439b15-d398-4c57-9772-15aa6d3bc34f)]
 interface nsIRadioInterfaceLayer : nsISupports
 {
   const unsigned short CALL_STATE_UNKNOWN = 0;
   const unsigned short CALL_STATE_DIALING = 1;
-  const unsigned short CALL_STATE_RINGING = 2;
+  const unsigned short CALL_STATE_ALERTING = 2;
   const unsigned short CALL_STATE_BUSY = 3;
   const unsigned short CALL_STATE_CONNECTING = 4;
   const unsigned short CALL_STATE_CONNECTED = 5;

dom/telephony/TelephonyCall.cpp

@@ -78,7 +78,7 @@ TelephonyCall::ChangeStateInternal(PRUint16 aCallState, bool aFireEvents)
     case nsIRadioInterfaceLayer::CALL_STATE_DIALING:
       stateString.AssignLiteral("dialing");
       break;
-    case nsIRadioInterfaceLayer::CALL_STATE_RINGING:
+    case nsIRadioInterfaceLayer::CALL_STATE_ALERTING:
       stateString.AssignLiteral("ringing");
       break;
     case nsIRadioInterfaceLayer::CALL_STATE_BUSY: