Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 944051 - Return networks for SIMs that already doesn't have a data connection. r=gene, r=jshih

Browse Source
This commit is contained in:
Albert Crespell 2013-12-03 17:26:04 +01:00
parent fe73b73366
commit 87f18cde71
1 changed files with 62 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
dom/network/src/NetworkStatsService.jsm
View File

@ -34,10 +34,9 @@ XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
"@mozilla.org/parentprocessmessagemanager;1",
"nsIMessageListenerManager");
XPCOMUtils.defineLazyServiceGetter(this, "networkManager",
"@mozilla.org/network/manager;1",
"nsINetworkManager");
XPCOMUtils.defineLazyServiceGetter(this, "gRil",
"@mozilla.org/ril;1",
"nsIRadioInterfaceLayer");
XPCOMUtils.defineLazyServiceGetter(this, "networkService",
"@mozilla.org/network/service;1",
@ -194,6 +193,20 @@ this.NetworkStatsService = {
/*
* nsINetworkStatsService
*/
getRilNetworks: function() {
let networks = {};
let numRadioInterfaces = gRil.numRadioInterfaces;
for (let i = 0; i < numRadioInterfaces; i++) {
let radioInterface = gRil.getRadioInterface(i);
if (radioInterface.rilContext.iccInfo) {
let netId = this.getNetworkId(radioInterface.rilContext.iccInfo.iccid,
NET_TYPE_MOBILE);
networks[netId] = { id : radioInterface.rilContext.iccInfo.iccid,
type: NET_TYPE_MOBILE };
}
}
return networks;
},
convertNetworkInterface: function(aNetwork) {
if (aNetwork.type != NET_TYPE_MOBILE &&
@ -229,7 +242,25 @@ this.NetworkStatsService = {
},
getAvailableNetworks: function getAvailableNetworks(mm, msg) {
let self = this;
let rilNetworks = this.getRilNetworks();
this._db.getAvailableNetworks(function onGetNetworks(aError, aResult) {
// Also return the networks that are valid but have not
// established connections yet.
for (let netId in rilNetworks) {
let found = false;
for (let i = 0; i < aResult.length; i++) {
if (netId == self.getNetworkId(aResult[i].id, aResult[i].type)) {
found = true;
break;
}
}
if (!found) {
aResult.push(rilNetworks[netId]);
}
}
mm.sendAsyncMessage("NetworkStats:GetAvailableNetworks:Return",
{ id: msg.id, error: aError, result: aResult });
});
@ -283,8 +314,23 @@ this.NetworkStatsService = {
// Check if the network is available in the DB. If yes, we also
// retrieve the stats for it from the DB.
this._db.isNetworkAvailable(network, function(aError, aResult) {
let toFind = false;
if (aResult) {
// If network is not active, there is no need to update stats.
toFind = true;
} else if (!aError) {
// Network is not found in the database without any errors.
// Check if network is valid but has not established a connection yet.
let rilNetworks = self.getRilNetworks();
if (rilNetworks[netId]) {
// find will not get data for network from the database but will format the
// result object in order to make NetworkStatsManager be able to construct a
// nsIDOMMozNetworkStats object.
toFind = true;
}
}
if (toFind) {
// If network is not active, there is no need to update stats before finding.
self._db.find(function onStatsFound(aError, aResult) {
mm.sendAsyncMessage("NetworkStats:Get:Return",
{ id: msg.id, error: aError, result: aResult });
@ -308,8 +354,18 @@ this.NetworkStatsService = {
debug("clear stats for network " + network.id + " of type " + network.type);
if (!this._networks[netId]) {
let error = "Invalid networkType";
let result = null;
// Check if network is valid but has not established a connection yet.
let rilNetworks = this.getRilNetworks();
if (rilNetworks[netId]) {
error = null;
result = true;
}
mm.sendAsyncMessage("NetworkStats:Clear:Return",
{ id: msg.id, error: "Invalid networkType", result: null });
{ id: msg.id, error: error, result: result });
return;
}