Backed out changeset 4e76f41737aa (bug 920551)
authorEd Morley <emorley@mozilla.com>
Fri, 25 Oct 2013 10:52:33 +0100
changeset 166004 5406996fe56163ef320985dbf54d93906afa47e6
parent 166003 c027223b3f4ad684d4d7da43e7e917dd0337c19d
child 166005 a012ea15eea8014ad6365fec2dbb51166073584c
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs920551
milestone27.0a1
backs out4e76f41737aab7ad51acffcb8be2a4e7fbd23a2e
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
Backed out changeset 4e76f41737aa (bug 920551)
b2g/app/b2g.js
dom/webidl/moz.build
modules/libpref/src/init/all.js
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -815,16 +815,19 @@ 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("ril.cellbroadcast.disabled", false);
 
+// ICC API
+pref("dom.icc.enabled", true);
+
 // Mobile Connection API
 pref("dom.mobileconnection.enabled", true);
 
 // Voice Mail API
 pref("dom.voicemail.enabled", true);
 
 // The url of the page used to display network error details.
 pref("b2g.neterror.url", "app://system.gaiamobile.org/net_error.html");
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -465,16 +465,17 @@ if CONFIG['MOZ_WEBSPEECH']:
 
 if CONFIG['MOZ_GAMEPAD']:
     WEBIDL_FILES += [
         'Gamepad.webidl',
     ]
 
 if CONFIG['MOZ_B2G_RIL']:
     WEBIDL_FILES += [
+        'MozStkCommandEvent.webidl',
         'MozVoicemail.webidl',
     ]
 
 WEBIDL_FILES += [
     'CloseEvent.webidl',
     'CustomEvent.webidl',
     'DeviceOrientationEvent.webidl',
     'DeviceStorageChangeEvent.webidl',
@@ -510,17 +511,16 @@ if CONFIG['MOZ_B2G_RIL']:
     WEBIDL_FILES += [
         'CFStateChangeEvent.webidl',
         'DataErrorEvent.webidl',
         'IccCardLockError.webidl',
         'MozCellBroadcast.webidl',
         'MozCellBroadcastEvent.webidl',
         'MozEmergencyCbModeEvent.webidl',
         'MozOtaStatusEvent.webidl',
-        'MozStkCommandEvent.webidl',
         'MozVoicemailEvent.webidl',
         'MozWifiConnectionInfoEvent.webidl',
         'MozWifiStatusChangeEvent.webidl',
         'USSDReceivedEvent.webidl',
     ]
 
 if CONFIG['MOZ_WEBSPEECH']:
     WEBIDL_FILES += [
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -4497,21 +4497,17 @@ 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
-#ifdef MOZ_B2G_RIL
-pref("dom.icc.enabled", true);
-#else
 pref("dom.icc.enabled", false);
-#endif
 
 // Mobile Connection API
 pref("dom.mobileconnection.enabled", false);
 
 // Voice Mail API
 pref("dom.voicemail.enabled", false);
 // Numeric default service id for Voice Mail API calls with |serviceId|
 // parameter omitted.