wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 786535 - B2G 3G: Handling roaming setting correctly. r=philikon

Browse Source
This commit is contained in:
Jose Antonio Olivera Ortega 2012-08-30 21:41:46 +02:00
parent 3b9299ae04
commit 6eac03e36e
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -589,21 +589,7 @@ RadioInterfaceLayer.prototype = {
if (!newInfo.batch) {
ppmm.broadcastAsyncMessage("RIL:DataInfoChanged", dataInfo);
}
if (!this.dataCallSettings["enabled"]) {
return;
}
let isRegistered =
newInfo.state == RIL.GECKO_MOBILE_CONNECTION_STATE_REGISTERED &&
(!newInfo.roaming || this._isDataRoamingEnabled());
let haveDataConnection =
newInfo.type != RIL.GECKO_MOBILE_CONNECTION_STATE_UNKNOWN;
if (isRegistered && haveDataConnection) {
debug("Radio is ready for data connection.");
this.updateRILNetworkInterface();
}
this.updateRILNetworkInterface();
},
handleSignalStrengthChange: function handleSignalStrengthChange(message) {
@ -693,6 +679,7 @@ RadioInterfaceLayer.prototype = {
// This check avoids data call connection if the radio is not ready
// yet after toggling off airplane mode.
if (this.rilContext.radioState != RIL.GECKO_RADIOSTATE_READY) {
debug("RIL is not ready for data connection: radio's not ready");
return;
}
@ -709,11 +696,29 @@ RadioInterfaceLayer.prototype = {
if (!this.dataCallSettings["enabled"] && RILNetworkInterface.connected) {
debug("Data call settings: disconnect data call.");
RILNetworkInterface.disconnect();
return;
}
if (this.dataCallSettings["enabled"] && !RILNetworkInterface.connected) {
debug("Data call settings connect data call.");
RILNetworkInterface.connect(this.dataCallSettings);
if (!this.dataCallSettings["enabled"] || RILNetworkInterface.connected) {
debug("Data call settings: nothing to do.");
return;
}
let dataInfo = this.rilContext.data;
let isRegistered =
dataInfo.state == RIL.GECKO_MOBILE_CONNECTION_STATE_REGISTERED;
let haveDataConnection =
dataInfo.type != RIL.GECKO_MOBILE_CONNECTION_STATE_UNKNOWN;
if (!isRegistered || !haveDataConnection) {
debug("RIL is not ready for data connection: Phone's not registered " +
"or doesn't have data connection.");
return;
}
if (dataInfo.roaming && !this.dataCallSettings["roaming_enabled"]) {
debug("We're roaming, but data roaming is disabled.");
return;
}
debug("Data call settings: connect data call.");
RILNetworkInterface.connect(this.dataCallSettings);
},
/**