Backout 8478f79368ae - caused Bug 1090788. a=backout
authorKai-Zhen Li <kli@mozilla.com>
Mon, 10 Nov 2014 12:02:43 +0800
changeset 204284 a7331fe82ec9dfb267e29b17bd9c5997cf6d6318
parent 204283 93da912120d8bd6eff45c8bb9e94a99a554e8031
child 204285 30129c3ac1e9c5fec2774c97d0f614842b50148b
push id76
push userkli@mozilla.com
push dateMon, 10 Nov 2014 04:03:01 +0000
treeherdermozilla-b2g32_v2_0m@a7331fe82ec9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1090788
milestone32.0
backs out8478f79368aeab3c350638a039b9799424ec6b65
Backout 8478f79368ae - caused Bug 1090788. a=backout
dom/system/gonk/ril_worker.js
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -5895,22 +5895,16 @@ RilObject.prototype[REQUEST_CANCEL_USSD]
   this._ussdSession = !options.success;
   options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
   this.sendChromeMessage(options);
 };
 RilObject.prototype[REQUEST_GET_CLIR] = function REQUEST_GET_CLIR(length, options) {
   options.success = (options.rilRequestError === 0);
   if (!options.success) {
     options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
-
-    if (options.callback) {
-      // Prevent DataCloneError when sending chrome messages.
-      delete options.callback;
-    }
-
     this.sendChromeMessage(options);
     return;
   }
 
   let Buf = this.context.Buf;
   let bufLength = Buf.readInt32();
   if (!bufLength || bufLength < 2) {
     options.success = false;
@@ -6008,22 +6002,16 @@ RilObject.prototype[REQUEST_SET_CLIR] = 
   this.sendChromeMessage(options);
 };
 
 RilObject.prototype[REQUEST_QUERY_CALL_FORWARD_STATUS] =
   function REQUEST_QUERY_CALL_FORWARD_STATUS(length, options) {
   options.success = (options.rilRequestError === 0);
   if (!options.success) {
     options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
-
-    if (options.callback) {
-      // Prevent DataCloneError when sending chrome messages.
-      delete options.callback;
-    }
-
     this.sendChromeMessage(options);
     return;
   }
 
   let Buf = this.context.Buf;
   let rulesLength = 0;
   if (length) {
     rulesLength = Buf.readInt32();