From d0540019615cf424d4b8594aecffaf1daf00b649 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 6 May 2013 08:57:03 -0400
Subject: [PATCH] Backed out changeset 4270acd843cc (bug 863130) for B2G
 Marionette failures.

---
 b2g/app/b2g.js                         | 1 -
 b2g/chrome/content/settings.js         | 5 -----
 dom/system/gonk/RadioInterfaceLayer.js | 9 +--------
 modules/libpref/src/init/all.js        | 1 -
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 9b3dbbca0585..828aea688342 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -381,7 +381,6 @@ pref("dom.ipc.browser_frames.oop_by_default", false);
 // Temporary permission hack for WebSMS
 pref("dom.sms.enabled", true);
 pref("dom.sms.strict7BitEncoding", false); // Disabled by default.
-pref("dom.sms.requestStatusReport", false); // Disabled by default.
 
 // Temporary permission hack for WebContacts
 pref("dom.mozContacts.enabled", true);
diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js
index 806b5fa767b4..125adefd33b5 100644
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -164,11 +164,6 @@ SettingsListener.observe('language.current', 'en-US', function(value) {
     function(value) {
       Services.prefs.setBoolPref('dom.sms.strict7BitEncoding', value);
   });
-
-  SettingsListener.observe('ril.sms.requestStatusReport.enabled', false,
-    function(value) {
-      Services.prefs.setBoolPref('dom.sms.requestStatusReport', value);
-  });
 })();
 
 //=================== DeviceInfo ====================
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index 6bee02a47cf5..2d140268cb7d 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -2696,14 +2696,7 @@ RadioInterfaceLayer.prototype = {
     let options = this._fragmentText(message, null, strict7BitEncoding);
     options.rilMessageType = "sendSMS";
     options.number = PhoneNumberUtils.normalize(number);
-    let requestStatusReport;
-    try {
-      requestStatusReport =
-        Services.prefs.getBoolPref("dom.sms.requestStatusReport");
-    } catch (e) {
-      requestStatusReport = false;
-    }
-    options.requestStatusReport = requestStatusReport;
+    options.requestStatusReport = true;
     if (options.segmentMaxSeq > 1) {
       options.segmentRef16Bit = this.segmentRef16Bit;
       options.segmentRef = this.nextSegmentRef;
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 55dcc1de2cb2..68344be948b0 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -4068,7 +4068,6 @@ pref("dom.sms.enabled", false);
 // Enable Latin characters replacement with corresponding ones in GSM SMS
 // 7-bit default alphabet.
 pref("dom.sms.strict7BitEncoding", false);
-pref("dom.sms.requestStatusReport", false);
 
 // WebContacts
 pref("dom.mozContacts.enabled", false);