Bug 920551 - 2.d/2: fix ICC. r=hsinyi,khuey

Brli · Oct 29, 2013 · fdf3d4b · fdf3d4b
1 parent 2a45e4e
commit fdf3d4b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
@@ -824,9 +824,6 @@ pref("gfx.gralloc.fence-with-readpixels", true);
 // Cell Broadcast API
 pref("ril.cellbroadcast.disabled", false);
 
-// ICC API
-pref("dom.icc.enabled", true);
-
 // Mobile Connection API
 pref("dom.mobileconnection.enabled", true);
 

diff --git a/dom/base/moz.build b/dom/base/moz.build
@@ -128,7 +128,6 @@ LIBRARY_NAME = 'jsdombase_s'
 LOCAL_INCLUDES += [
     '../battery',
     '../bluetooth',
-    '../icc/src',
     '../media',
     '../network/src',
     '../src/geolocation',

diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
@@ -471,7 +471,6 @@ if CONFIG['MOZ_GAMEPAD']:
 
 if CONFIG['MOZ_B2G_RIL']:
     WEBIDL_FILES += [
-        'MozStkCommandEvent.webidl',
         'MozVoicemail.webidl',
     ]
 
@@ -517,6 +516,7 @@ if CONFIG['MOZ_B2G_RIL']:
         'MozCellBroadcastEvent.webidl',
         'MozEmergencyCbModeEvent.webidl',
         'MozOtaStatusEvent.webidl',
+        'MozStkCommandEvent.webidl',
         'MozVoicemailEvent.webidl',
         'MozWifiConnectionInfoEvent.webidl',
         'MozWifiStatusChangeEvent.webidl',

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
@@ -4529,7 +4529,11 @@ pref("dom.cellbroadcast.enabled", false);
 #endif
 
 // ICC API
+#ifdef MOZ_B2G_RIL
+pref("dom.icc.enabled", true);
+#else
 pref("dom.icc.enabled", false);
+#endif
 
 // Mobile Connection API
 pref("dom.mobileconnection.enabled", false);