Bug 934125 - 3.b/3: fix alignment. r=gene
authorVicamo Yang <vyang@mozilla.com>
Mon, 13 Jan 2014 10:44:56 +0800
changeset 163103 50a48b7154192a4727c6829cc9faf1a52cce09f2
parent 163102 e24b5206e3190a40c0cac23a029c8f6879701581
child 163104 6e28648fdfa2ef2d3ab722c0881f7768ebef78f0
push id25980
push usercbook@mozilla.com
push dateMon, 13 Jan 2014 11:51:10 +0000
treeherdermozilla-central@80a27198344a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgene
bugs934125
milestone29.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 934125 - 3.b/3: fix alignment. r=gene
dom/system/gonk/ril_worker.js
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -5444,75 +5444,75 @@ RIL[REQUEST_SET_CLIR] = function(length,
         options.statusMessage = MMI_SM_KS_SERVICE_DISABLED;
         break;
     }
   }
   this.sendChromeMessage(options);
 };
 
 RIL[REQUEST_QUERY_CALL_FORWARD_STATUS] = function(length, options) {
-    options.success = (options.rilRequestError === 0);
-    if (!options.success) {
-      options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
-      this.sendChromeMessage(options);
-      return;
-    }
-
-    let rulesLength = 0;
-    if (length) {
-      rulesLength = Buf.readInt32();
-    }
-    if (!rulesLength) {
-      options.success = false;
-      options.errorMsg = GECKO_ERROR_GENERIC_FAILURE;
-      this.sendChromeMessage(options);
-      return;
-    }
-    let rules = new Array(rulesLength);
-    for (let i = 0; i < rulesLength; i++) {
-      let rule = {};
-      rule.active       = Buf.readInt32() == 1; // CALL_FORWARD_STATUS_*
-      rule.reason       = Buf.readInt32(); // CALL_FORWARD_REASON_*
-      rule.serviceClass = Buf.readInt32();
-      rule.toa          = Buf.readInt32();
-      rule.number       = Buf.readString();
-      rule.timeSeconds  = Buf.readInt32();
-      rules[i] = rule;
-    }
-    options.rules = rules;
-    if (options.rilMessageType === "sendMMI") {
-      options.statusMessage = MMI_SM_KS_SERVICE_INTERROGATED;
-      // MMI query call forwarding options request returns a set of rules that
-      // will be exposed in the form of an array of nsIDOMMozMobileCFInfo
-      // instances.
-      options.additionalInformation = rules;
-    }
+  options.success = (options.rilRequestError === 0);
+  if (!options.success) {
+    options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
+    this.sendChromeMessage(options);
+    return;
+  }
+
+  let rulesLength = 0;
+  if (length) {
+    rulesLength = Buf.readInt32();
+  }
+  if (!rulesLength) {
+    options.success = false;
+    options.errorMsg = GECKO_ERROR_GENERIC_FAILURE;
     this.sendChromeMessage(options);
+    return;
+  }
+  let rules = new Array(rulesLength);
+  for (let i = 0; i < rulesLength; i++) {
+    let rule = {};
+    rule.active       = Buf.readInt32() == 1; // CALL_FORWARD_STATUS_*
+    rule.reason       = Buf.readInt32(); // CALL_FORWARD_REASON_*
+    rule.serviceClass = Buf.readInt32();
+    rule.toa          = Buf.readInt32();
+    rule.number       = Buf.readString();
+    rule.timeSeconds  = Buf.readInt32();
+    rules[i] = rule;
+  }
+  options.rules = rules;
+  if (options.rilMessageType === "sendMMI") {
+    options.statusMessage = MMI_SM_KS_SERVICE_INTERROGATED;
+    // MMI query call forwarding options request returns a set of rules that
+    // will be exposed in the form of an array of nsIDOMMozMobileCFInfo
+    // instances.
+    options.additionalInformation = rules;
+  }
+  this.sendChromeMessage(options);
 };
 RIL[REQUEST_SET_CALL_FORWARD] = function(length, options) {
-    options.success = (options.rilRequestError === 0);
-    if (!options.success) {
-      options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
-    } else if (options.rilMessageType === "sendMMI") {
-      switch (options.action) {
-        case CALL_FORWARD_ACTION_ENABLE:
-          options.statusMessage = MMI_SM_KS_SERVICE_ENABLED;
-          break;
-        case CALL_FORWARD_ACTION_DISABLE:
-          options.statusMessage = MMI_SM_KS_SERVICE_DISABLED;
-          break;
-        case CALL_FORWARD_ACTION_REGISTRATION:
-          options.statusMessage = MMI_SM_KS_SERVICE_REGISTERED;
-          break;
-        case CALL_FORWARD_ACTION_ERASURE:
-          options.statusMessage = MMI_SM_KS_SERVICE_ERASED;
-          break;
-      }
-    }
-    this.sendChromeMessage(options);
+  options.success = (options.rilRequestError === 0);
+  if (!options.success) {
+    options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
+  } else if (options.rilMessageType === "sendMMI") {
+    switch (options.action) {
+      case CALL_FORWARD_ACTION_ENABLE:
+        options.statusMessage = MMI_SM_KS_SERVICE_ENABLED;
+        break;
+      case CALL_FORWARD_ACTION_DISABLE:
+        options.statusMessage = MMI_SM_KS_SERVICE_DISABLED;
+        break;
+      case CALL_FORWARD_ACTION_REGISTRATION:
+        options.statusMessage = MMI_SM_KS_SERVICE_REGISTERED;
+        break;
+      case CALL_FORWARD_ACTION_ERASURE:
+        options.statusMessage = MMI_SM_KS_SERVICE_ERASED;
+        break;
+    }
+  }
+  this.sendChromeMessage(options);
 };
 RIL[REQUEST_QUERY_CALL_WAITING] = function(length, options) {
   options.success = (options.rilRequestError === 0);
   if (!options.success) {
     options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
     this.sendChromeMessage(options);
     return;
   }