Bug 1114935 - Part 6.6: Migration in PushService.jsm. r=nsm

This commit is contained in:
Bevis Tseng 2015-01-15 18:40:01 +08:00
parent 048d9738ca
commit 246d8175fc

View File

@ -1775,14 +1775,15 @@ this.PushService = {
let nm = Cc["@mozilla.org/network/manager;1"].getService(Ci.nsINetworkManager); let nm = Cc["@mozilla.org/network/manager;1"].getService(Ci.nsINetworkManager);
if (nm.active && nm.active.type == Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE) { if (nm.active && nm.active.type == Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE) {
let icc = Cc["@mozilla.org/ril/content-helper;1"].getService(Ci.nsIIccProvider); let iccService = Cc["@mozilla.org/icc/iccservice;1"].getService(Ci.nsIIccService);
// TODO: Bug 927721 - PushService for multi-sim // TODO: Bug 927721 - PushService for multi-sim
// In Multi-sim, there is more than one client in iccProvider. Each // In Multi-sim, there is more than one client in iccService. Each
// client represents a icc service. To maintain backward compatibility // client represents a icc handle. To maintain backward compatibility
// with single sim, we always use client 0 for now. Adding support // with single sim, we always use client 0 for now. Adding support
// for multiple sim will be addressed in bug 927721, if needed. // for multiple sim will be addressed in bug 927721, if needed.
let clientId = 0; let clientId = 0;
let iccInfo = icc.getIccInfo(clientId); let icc = iccService.getIccByServiceId(clientId);
let iccInfo = icc && icc.iccInfo;
if (iccInfo) { if (iccInfo) {
debug("Running on mobile data"); debug("Running on mobile data");