Bug 1095362 - Part 5: Internal architecture changes (ril_worker.js). r=aknow
authorBen Hsu <bhsu@mozilla.com>
Sun, 11 Jan 2015 03:26:00 -0500
changeset 223636 49140c36a7fd3aa3261cacdd10ec5f18a3a39bd6
parent 223635 a232d580f5e9c7dad08e1bf1441c5fe263def7c6
child 223637 1357f398c62284d9501fae6b2e5d40362022f23e
push id28099
push userkwierso@gmail.com
push dateWed, 14 Jan 2015 01:38:51 +0000
treeherdermozilla-central@3100ceecc1bb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaknow
bugs1095362
milestone38.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 1095362 - Part 5: Internal architecture changes (ril_worker.js). r=aknow
dom/system/gonk/ril_worker.js
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -1975,24 +1975,32 @@ RilObject.prototype = {
       this.hangUpForeground(options);
     } else {
       this.hangUpBackground(options);
     }
   },
 
   holdConference: function(options) {
     if (this._isCdma) {
+      // We cannot hold a conference call on CDMA.
+      options.success = false;
+      options.errorMsg = GECKO_ERROR_GENERIC_FAILURE;
+      this.sendChromeMessage(options);
       return;
     }
 
     this.switchActiveCall(options);
   },
 
   resumeConference: function(options) {
     if (this._isCdma) {
+      // We cannot resume a conference call on CDMA
+      options.success = false;
+      options.errorMsg = GECKO_ERROR_GENERIC_FAILURE;
+      this.sendChromeMessage(options);
       return;
     }
 
     this.switchActiveCall(options);
   },
 
   /**
    * Get current calls.