From 600a32f491e48dd0ab09c0ddaefdad367b764166 Mon Sep 17 00:00:00 2001
From: Vicamo Yang <vyang@mozilla.com>
Date: Tue, 29 Oct 2013 16:12:39 +0800
Subject: [PATCH] Bug 920551 - 2.c/2: fix CellBroadcast. r=hsinyi

---
 b2g/app/b2g.js                  | 1 -
 modules/libpref/src/init/all.js | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index a9b0b7a81848..85c3de85398d 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -822,7 +822,6 @@ pref("gfx.canvas.skiagl.dynamic-cache", true);
 pref("gfx.gralloc.fence-with-readpixels", true);
 
 // Cell Broadcast API
-pref("dom.cellbroadcast.enabled", true);
 pref("ril.cellbroadcast.disabled", false);
 
 // ICC API
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 7875b700ac08..f59cfb822ef4 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -4522,7 +4522,11 @@ pref("dom.telephony.enabled", false);
 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);