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

Bug 939046 - Part 1.b: use network id in ril to look for networkInterfaces. r=hsinyi,vicamo

Browse Source
This commit is contained in:
Jessica Jong 2014-05-27 02:03:00 +02:00
parent a245ba2d85
commit cdc37b7ffa
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/system/gonk/RadioInterfaceLayer.js
View File

@ -1153,7 +1153,7 @@ DataConnectionHandler.prototype = {
// Unregister anything from iface and delete it.
for (let [, apnSetting] in Iterator(this.apnSettings.byApn)) {
if (apnSetting.iface.name in gNetworkManager.networkInterfaces) {
if (apnSetting.iface.networkId in gNetworkManager.networkInterfaces) {
gNetworkManager.unregisterNetworkInterface(apnSetting.iface);
}
this.unregisterDataCallCallback(apnSetting.iface);
@ -1406,7 +1406,7 @@ DataConnectionHandler.prototype = {
if (apnSetting.iface.connected) {
// Update the interface status via-registration if the interface has
// already been registered in the network manager.
if (apnSetting.iface.name in gNetworkManager.networkInterfaces) {
if (apnSetting.iface.networkId in gNetworkManager.networkInterfaces) {
gNetworkManager.unregisterNetworkInterface(apnSetting.iface);
}
gNetworkManager.registerNetworkInterface(apnSetting.iface);
@ -1439,7 +1439,7 @@ DataConnectionHandler.prototype = {
if (apnSetting.iface.connectedTypes.length && apnSetting.iface.connected) {
// Update the interface status via-registration if the interface has
// already been registered in the network manager.
if (apnSetting.iface.name in gNetworkManager.networkInterfaces) {
if (apnSetting.iface.networkId in gNetworkManager.networkInterfaces) {
gNetworkManager.unregisterNetworkInterface(apnSetting.iface);
}
gNetworkManager.registerNetworkInterface(apnSetting.iface);
@ -4506,6 +4506,10 @@ RILNetworkInterface.prototype = {
return this.dnses.slice();
},
get networkId() {
return "ril" + this.serviceId + "-" + this.type;
},
debug: function(s) {
dump("-*- RILNetworkInterface[" + this.dataConnectionHandler.clientId + ":" +
this.type + "]: " + s + "\n");