Bug 735170 - WebTelephony: add API to hold a call. r=philikon

dom/system/gonk/RadioInterfaceLayer.js

@@ -84,9 +84,8 @@ function convertRILCallState(state) {
     case RIL.CALL_STATE_ALERTING:
       return nsIRadioInterfaceLayer.CALL_STATE_ALERTING;
     case RIL.CALL_STATE_INCOMING:
-      return nsIRadioInterfaceLayer.CALL_STATE_INCOMING;
     case RIL.CALL_STATE_WAITING:
-      return nsIRadioInterfaceLayer.CALL_STATE_HELD; // XXX This may not be right...
+      return nsIRadioInterfaceLayer.CALL_STATE_INCOMING; 
     default:
       throw new Error("Unknown rilCallState: " + state);
   }
@@ -514,6 +513,14 @@ RadioInterfaceLayer.prototype = {
     this.worker.postMessage({type: "rejectCall", callIndex: callIndex});
   },
  
+  holdCall: function holdCall(callIndex) {
+    this.worker.postMessage({type: "holdCall", callIndex: callIndex});
+  },
+
+  resumeCall: function resumeCall(callIndex) {
+    this.worker.postMessage({type: "resumeCall", callIndex: callIndex});
+  },
+
   get microphoneMuted() {
     return gAudioManager.microphoneMuted;
   },

dom/system/gonk/nsIRadioInterfaceLayer.idl

@@ -116,7 +116,7 @@ interface nsIRILDataCallback : nsISupports
                            in unsigned long length);
 };
 
-[scriptable, uuid(7a439b15-d398-4c57-9772-15aa6d3bc34f)]
+[scriptable, uuid(d2025763-fc32-436e-b207-0228ea1ccd12)]
 interface nsIRadioInterfaceLayer : nsISupports
 {
   const unsigned short CALL_STATE_UNKNOWN = 0;
@@ -161,6 +161,8 @@ interface nsIRadioInterfaceLayer : nsISupports
 
   void answerCall(in unsigned long callIndex);
   void rejectCall(in unsigned long callIndex);
+  void holdCall(in unsigned long callIndex);
+  void resumeCall(in unsigned long callIndex);
 
   attribute bool microphoneMuted;
   attribute bool speakerEnabled;

dom/system/gonk/ril_worker.js

@@ -986,6 +986,20 @@ let RIL = {
     }
   },
   
+  holdCall: function holdCall(options) {
+    let call = this.currentCalls[options.callIndex];
+    if (call && call.state == CALL_STATE_ACTIVE) {
+      Buf.simpleRequest(REQUEST_SWITCH_HOLDING_AND_ACTIVE);
+    }
+  },
+
+  resumeCall: function resumeCall(options) {
+    let call = this.currentCalls[options.callIndex];
+    if (call && call.state == CALL_STATE_HOLDING) {
+      Buf.simpleRequest(REQUEST_SWITCH_HOLDING_AND_ACTIVE);
+    }
+  },
+
   /**
    * Send an SMS.
    *
@@ -1675,13 +1689,18 @@ RIL[REQUEST_DIAL] = null;
 RIL[REQUEST_GET_IMSI] = function REQUEST_GET_IMSI(length) {
   this.IMSI = Buf.readString();
 };
-RIL[REQUEST_HANGUP] = function REQUEST_HANGUP (length) {
+RIL[REQUEST_HANGUP] = function REQUEST_HANGUP(length) {
   this.getCurrentCalls();
 }; 
 RIL[REQUEST_HANGUP_WAITING_OR_BACKGROUND] = null;
 RIL[REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND] = null;
 RIL[REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE] = null;
-RIL[REQUEST_SWITCH_HOLDING_AND_ACTIVE] = null;
+RIL[REQUEST_SWITCH_HOLDING_AND_ACTIVE] = function REQUEST_SWITCH_HOLDING_AND_ACTIVE(length) {
+  // XXX Normally we should get a UNSOLICITED_RESPONSE_CALL_STATE_CHANGED parcel 
+  // notifying us of call state changes, but sometimes we don't (have no idea why).
+  // this.getCurrentCalls() helps update the call state actively.
+  this.getCurrentCalls();
+};
 RIL[REQUEST_CONFERENCE] = null;
 RIL[REQUEST_UDUB] = null;
 RIL[REQUEST_LAST_CALL_FAIL_CAUSE] = null;

dom/telephony/TelephonyCall.cpp

@@ -164,7 +164,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(TelephonyCall,
   NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(connected)
   NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(disconnecting)
   NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(disconnected)
-  NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(incoming)
+  NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(holding)
+  NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(held)
+  NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(resuming)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(TelephonyCall,
@@ -178,7 +180,9 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(TelephonyCall,
   NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(connected)
   NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(disconnecting)
   NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(disconnected)
-  NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(incoming)
+  NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(holding)
+  NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(held)
+  NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(resuming)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TelephonyCall)
@@ -238,6 +242,36 @@ TelephonyCall::HangUp()
   return NS_OK;
 }
 
+NS_IMETHODIMP
+TelephonyCall::Hold()
+{
+  if (mCallState != nsIRadioInterfaceLayer::CALL_STATE_CONNECTED) {
+    NS_WARNING("Hold non-connected call ignored!");
+    return NS_OK;
+  }
+  
+  nsresult rv = mTelephony->RIL()->HoldCall(mCallIndex);
+  NS_ENSURE_SUCCESS(rv,rv);
+  
+  ChangeStateInternal(nsIRadioInterfaceLayer::CALL_STATE_HOLDING, true);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TelephonyCall::Resume()
+{
+  if (mCallState != nsIRadioInterfaceLayer::CALL_STATE_HELD) {
+    NS_WARNING("Resume non-held call ignored!");
+    return NS_OK;
+  }
+  
+  nsresult rv = mTelephony->RIL()->ResumeCall(mCallIndex);
+  NS_ENSURE_SUCCESS(rv,rv);
+  
+  ChangeStateInternal(nsIRadioInterfaceLayer::CALL_STATE_RESUMING, true);
+  return NS_OK;
+}
+
 NS_IMPL_EVENT_HANDLER(TelephonyCall, statechange)
 NS_IMPL_EVENT_HANDLER(TelephonyCall, dialing)
 NS_IMPL_EVENT_HANDLER(TelephonyCall, alerting)
@@ -246,4 +280,6 @@ NS_IMPL_EVENT_HANDLER(TelephonyCall, connecting)
 NS_IMPL_EVENT_HANDLER(TelephonyCall, connected)
 NS_IMPL_EVENT_HANDLER(TelephonyCall, disconnecting)
 NS_IMPL_EVENT_HANDLER(TelephonyCall, disconnected)
-NS_IMPL_EVENT_HANDLER(TelephonyCall, incoming)
+NS_IMPL_EVENT_HANDLER(TelephonyCall, holding)
+NS_IMPL_EVENT_HANDLER(TelephonyCall, held)
+NS_IMPL_EVENT_HANDLER(TelephonyCall, resuming)

dom/telephony/TelephonyCall.h

@@ -60,7 +60,9 @@ class TelephonyCall : public nsDOMEventTargetHelper,
   NS_DECL_EVENT_HANDLER(connected)
   NS_DECL_EVENT_HANDLER(disconnecting)
   NS_DECL_EVENT_HANDLER(disconnected)
-  NS_DECL_EVENT_HANDLER(incoming)
+  NS_DECL_EVENT_HANDLER(holding)
+  NS_DECL_EVENT_HANDLER(held)
+  NS_DECL_EVENT_HANDLER(resuming)
 
   nsRefPtr<Telephony> mTelephony;
 

dom/telephony/nsIDOMTelephonyCall.idl

@@ -41,7 +41,7 @@
 
 interface nsIDOMEventListener;
 
-[scriptable, builtinclass, uuid(f741d52a-38bd-48f8-838b-cf4cd74a6ea5)]
+[scriptable, builtinclass, uuid(2fb9502b-2054-4eda-8db7-3726c39144f7)]
 interface nsIDOMTelephonyCall : nsIDOMEventTarget
 {
   readonly attribute DOMString number;
@@ -50,6 +50,8 @@ interface nsIDOMTelephonyCall : nsIDOMEventTarget
 
   void answer();
   void hangUp();
+  void hold();
+  void resume();
 
   attribute nsIDOMEventListener onstatechange;
 
@@ -60,5 +62,7 @@ interface nsIDOMTelephonyCall : nsIDOMEventTarget
   attribute nsIDOMEventListener onconnected;
   attribute nsIDOMEventListener ondisconnecting;
   attribute nsIDOMEventListener ondisconnected;
-  attribute nsIDOMEventListener onincoming;
+  attribute nsIDOMEventListener onholding;
+  attribute nsIDOMEventListener onheld;
+  attribute nsIDOMEventListener onresuming;
 };