Bug 784220 - B2G telephony: expose call waiting status. r=philikon

dom/system/gonk/RadioInterfaceLayer.js

@@ -181,6 +181,8 @@ function RadioInterfaceLayer() {
                      relSignalStrength: null},
   };
 
+  this.callWaitingStatus = null;
+
   // Read the 'ril.radio.disabled' setting in order to start with a known
   // value at boot time.
   gSettingsService.createLock().get("ril.radio.disabled", this);
@@ -201,6 +203,9 @@ function RadioInterfaceLayer() {
                                   "ril.data.httpProxyHost",
                                   "ril.data.httpProxyPort"];
 
+  // Read the desired setting of call waiting from the settings DB.
+  gSettingsService.getLock().get("ril.callwaiting.enabled", this);
+
   this._messageManagerByRequest = {};
 
   for each (let msgname in RIL_IPC_MSG_NAMES) {
@@ -392,6 +397,9 @@ RadioInterfaceLayer.prototype = {
         this.rilContext.cardState = message.cardState;
         ppmm.broadcastAsyncMessage("RIL:CardStateChanged", message);
         break;
+      case "setCallWaiting":
+        this.handleCallWaitingStatusChange(message);
+        break;
       case "sms-received":
         this.handleSmsReceived(message);
         return;
@@ -547,6 +555,12 @@ RadioInterfaceLayer.prototype = {
     // this here. (TODO GSM only for now, see bug 726098.)
     voiceInfo.type = "gsm";
 
+    // Ensure the call waiting status once the voice network connects.
+    if (voiceInfo.connected && this.callWaitingStatus == null) {
+      // The call waiting status has not been updated yet. Update that.
+      this.setCallWaitingEnabled(this._callWaitingEnabled);
+    }
+
     // Make sure we also reset the operator and signal strength information
     // if we drop off the network.
     if (newInfo.regState == RIL.NETWORK_CREG_STATE_UNKNOWN) {
@@ -680,6 +694,42 @@ RadioInterfaceLayer.prototype = {
     }
   },
 
+  handleCallWaitingStatusChange: function handleCallWaitingStatusChange(message) {
+    let newStatus = message.enabled;
+
+    // RIL fails in setting call waiting status. Reset "ril.callwaiting.enabled"
+    // in the settings DB.
+    if (!message.success) {
+      newStatus = !newStatus;
+      gSettingsService.getLock().set("ril.callwaiting.enabled",
+                                     newStatus,
+                                     null);
+      return;
+    }
+
+    this.callWaitingStatus = newStatus;
+  },
+
+  setCallWaitingEnabled: function setCallWaitingEnabled(value) {
+    debug("Current call waiting status is " + this.callWaitingStatus +
+          ", desired call waiting status is " + value);
+    if (!this.rilContext.voice.connected) {
+      // The voice network is not connected. Wait for that.
+      return;
+    }
+
+    if (value == null) {
+      // We haven't read the initial value from the settings DB yet.
+      // Wait for that.
+      return;
+    }
+
+    if (this.callWaitingStatus != value) {
+      debug("Setting call waiting status to " + value);
+      this.worker.postMessage({rilMessageType: "setCallWaiting", enabled: value});
+    }
+  },
+
   updateRILNetworkInterface: function updateRILNetworkInterface() {
     if (this._dataCallSettingsToRead.length) {
       debug("We haven't read completely the APN data from the " +
@@ -1097,6 +1147,11 @@ RadioInterfaceLayer.prototype = {
   // corresponds to the 'ril.radio.disabled' setting from the UI.
   _radioEnabled: null,
 
+  // Flag to determine whether we reject a waiting call directly or we
+  // notify the UI of a waiting call. It corresponds to the
+  // 'ril.callwaiting.enbled' setting from the UI.
+  _callWaitingEnabled: null,
+
   // APN data for making data calls.
   dataCallSettings: {},
   _dataCallSettingsToRead: [],
@@ -1129,9 +1184,13 @@ RadioInterfaceLayer.prototype = {
         }
         this.updateRILNetworkInterface();
         break;
+      case "ril.callwaiting.enabled":
+        this._callWaitingEnabled = aResult;
+        this.setCallWaitingEnabled(this._callWaitingEnabled);
+        break;
     };
   },
-    
+
   handleError: function handleError(aErrorMessage) {
     debug("There was an error while reading RIL settings.");
 

dom/system/gonk/ril_worker.js

@@ -1513,6 +1513,20 @@ let RIL = {
     Buf.sendParcel();
   },
 
+  /**
+   * Set call waiting status.
+   *
+   * @param on
+   *        Boolean indicating the desired waiting status.
+   */
+  setCallWaiting: function setCallWaiting(options) {
+    Buf.newParcel(REQUEST_SET_CALL_WAITING, options);
+    Buf.writeUint32(2);
+    Buf.writeUint32(options.enabled ? 1 : 0);
+    Buf.writeUint32(ICC_SERVICE_CLASS_VOICE);
+    Buf.sendParcel();
+  },
+
   /**
    * Set screen state.
    *
@@ -3619,7 +3633,10 @@ RIL[REQUEST_SET_CLIR] = null;
 RIL[REQUEST_QUERY_CALL_FORWARD_STATUS] = null;
 RIL[REQUEST_SET_CALL_FORWARD] = null;
 RIL[REQUEST_QUERY_CALL_WAITING] = null;
-RIL[REQUEST_SET_CALL_WAITING] = null;
+RIL[REQUEST_SET_CALL_WAITING] = function REQUEST_SET_CALL_WAITING(length, options) {
+  options.success = options.rilRequestError == 0 ? true : false;
+  this.sendDOMMessage(options);
+};
 RIL[REQUEST_SMS_ACKNOWLEDGE] = null;
 RIL[REQUEST_GET_IMEI] = function REQUEST_GET_IMEI(length, options) {
   if (options.rilRequestError) {