Commit c2078c43 authored by Vicamo Yang's avatar Vicamo Yang
Browse files

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

parent 9b15bc04

b2g/app/b2g.js

+0 −3
Original line number Diff line number Diff line
@@ -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);

dom/base/moz.build

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ LIBRARY_NAME = 'jsdombase_s' 
LOCAL_INCLUDES += [

    '../battery',

    '../bluetooth',

    '../icc/src',

    '../media',

    '../network/src',

    '../src/geolocation',

dom/webidl/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,6 @@ if CONFIG['MOZ_GAMEPAD']: 


if CONFIG['MOZ_B2G_RIL']:

    WEBIDL_FILES += [

        'MozStkCommandEvent.webidl',

        'MozVoicemail.webidl',

    ]
@@ -516,6 +515,7 @@ if CONFIG['MOZ_B2G_RIL']: 
        'MozCellBroadcastEvent.webidl',

        'MozEmergencyCbModeEvent.webidl',

        'MozOtaStatusEvent.webidl',

        'MozStkCommandEvent.webidl',

        'MozVoicemailEvent.webidl',

        'MozWifiConnectionInfoEvent.webidl',

        'MozWifiStatusChangeEvent.webidl',

modules/libpref/src/init/all.js

+4 −0
Original line number Diff line number Diff line
@@ -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);