mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-30 00:01:50 +00:00
Backed out changeset 4270acd843cc (bug 863130) for B2G Marionette failures.
This commit is contained in:
parent
69bc23d299
commit
d054001961
@ -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);
|
||||
|
@ -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 ====================
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user