Bug 920551 - 2.c/2: fix CellBroadcast. r=hsinyi
☠☠ backed out by a012ea15eea8 ☠ ☠
authorVicamo Yang <vyang@mozilla.com>
Fri, 25 Oct 2013 11:07:23 +0800
changeset 166919 f470dfdfb79ea85590b6b188bc7899abeae44e05
parent 166918 b9c1e3b97da2d9ae3c57e521b91c1c5f9c1d6242
child 166920 4e76f41737aab7ad51acffcb8be2a4e7fbd23a2e
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershsinyi
bugs920551
milestone27.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 920551 - 2.c/2: fix CellBroadcast. r=hsinyi
b2g/app/b2g.js
modules/libpref/src/init/all.js
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -813,17 +813,16 @@ pref("devtools.debugger.unix-domain-sock
 // falling back to Skia/software for smaller canvases
 pref("gfx.canvas.azure.backends", "skia");
 pref("gfx.canvas.azure.accelerated", true);
 
 // Turn on dynamic cache size for Skia
 pref("gfx.canvas.skiagl.dynamic-cache", true);
 
 // Cell Broadcast API
-pref("dom.cellbroadcast.enabled", true);
 pref("ril.cellbroadcast.disabled", false);
 
 // ICC API
 pref("dom.icc.enabled", true);
 
 // Mobile Connection API
 pref("dom.mobileconnection.enabled", true);
 
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -4490,17 +4490,21 @@ pref("dom.telephony.enabled", true);
 #else
 pref("dom.telephony.enabled", false);
 #endif
 // Numeric default service id for WebTelephony API calls with |serviceId|
 // parameter omitted.
 pref("dom.telephony.defaultServiceId", 0);
 
 // Cell Broadcast API
+#ifdef MOZ_B2G_RIL
+pref("dom.cellbroadcast.enabled", true);
+#else
 pref("dom.cellbroadcast.enabled", false);
+#endif
 
 // ICC API
 pref("dom.icc.enabled", false);
 
 // Mobile Connection API
 pref("dom.mobileconnection.enabled", false);
 
 // Voice Mail API