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 1067629 - Part 1: Construct a radio state FSM(mobileConnectionService.js). r=aknow

Browse Source
This commit is contained in:
Ben Hsu 2015-02-16 21:42:00 -05:00
parent 011c704775
commit 68a5400a5c
1 changed files with 106 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
dom/mobileconnection/gonk/MobileConnectionService.js
View File

@ -299,6 +299,13 @@ MobileConnectionProvider.prototype = {
*/
_selectingNetwork: null,
/**
* The two radio states below stand for the user expectation and the hardware
* status, respectively. |radioState| will be updated based on their values.
*/
_expectedRadioState: RIL.GECKO_RADIOSTATE_UNKNOWN,
_hardwareRadioState: RIL.GECKO_RADIOSTATE_UNKNOWN,
voice: null,
data: null,
networkSelectionMode: Ci.nsIMobileConnection.NETWORK_SELECTION_MODE_UNKNOWN,
@ -581,12 +588,83 @@ MobileConnectionProvider.prototype = {
}
},
updateRadioState: function(aRadioState) {
if (this.radioState === aRadioState) {
updateRadioState: function(aMessage, aCallback = null) {
switch (aMessage.msgType) {
case "ExpectedRadioState":
this._expectedRadioState = aMessage.msgData;
break;
case "HardwareRadioState":
this._hardwareRadioState = aMessage.msgData;
break;
default:
if (DEBUG) this._debug("updateRadioState: Invalid message type");
return;
}
if (aMessage.msgType === "ExpectedRadioState" && aCallback &&
this._hardwareRadioState === this._expectedRadioState) {
// Early resolved
aCallback.notifySuccess();
return;
}
this.radioState = aRadioState;
let newState;
switch (this._expectedRadioState) {
case RIL.GECKO_RADIOSTATE_ENABLED:
newState = this._hardwareRadioState === this._expectedRadioState ?
Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLED :
Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLING;
break;
case RIL.GECKO_RADIOSTATE_DISABLED:
newState = this._hardwareRadioState === this._expectedRadioState ?
Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLED :
Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLING;
break;
default: /* RIL.GECKO_RADIOSTATE_UNKNOWN */
switch (this._hardwareRadioState) {
case RIL.GECKO_RADIOSTATE_ENABLED:
newState = Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLED;
break;
case RIL.GECKO_RADIOSTATE_DISABLED:
newState = Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLED;
break;
default: /* RIL.GECKO_RADIOSTATE_UNKNOWN */
newState = Ci.nsIMobileConnection.MOBILE_RADIO_STATE_UNKNOWN;
}
}
// This update is triggered by underlying layers and the state is UNKNOWN
if (aMessage.msgType === "HardwareRadioState" &&
aMessage.msgData === RIL.GECKO_RADIOSTATE_UNKNOWN) {
// TODO: Find a better way than just setting the radio state to UNKNOWN
newState = Ci.nsIMobileConnection.MOBILE_RADIO_STATE_UNKNOWN;
}
if (newState === Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLING ||
newState === Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLING) {
let action = this._expectedRadioState === RIL.GECKO_RADIOSTATE_ENABLED;
this._radioInterface.sendWorkerMessage("setRadioEnabled",
{enabled: action},
function(aResponse) {
if (!aCallback) {
return false;
}
if (aResponse.errorMsg) {
aCallback.notifyError(aResponse.errorMsg);
return false;
}
aCallback.notifySuccess();
return false;
});
}
if (DEBUG) this._debug("Current Radio State is '" + newState + "'");
if (this.radioState === newState) {
return;
}
this.radioState = newState;
this.deliverListenerEvent("notifyRadioStateChanged");
},
@ -944,17 +1022,27 @@ MobileConnectionProvider.prototype = {
},
setRadioEnabled: function(aEnabled, aCallback) {
this._radioInterface.sendWorkerMessage("setRadioEnabled",
{enabled: aEnabled},
(function(aResponse) {
if (aResponse.errorMsg) {
aCallback.notifyError(aResponse.errorMsg);
return true;
}
if (DEBUG) {
this._debug("setRadioEnabled: " + aEnabled);
}
aCallback.notifySuccess();
return true;
}).bind(this));
// Before sending a equest to |ril_worker.js|, we should check radioState.
switch (this.radioState) {
case Ci.nsIMobileConnection.MOBILE_RADIO_STATE_UNKNOWN:
case Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLED:
case Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLED:
break;
default:
aCallback.notifyError("InvalidStateError");
return;
}
let message = {
msgType: "ExpectedRadioState",
msgData: (aEnabled ? RIL.GECKO_RADIOSTATE_ENABLED :
RIL.GECKO_RADIOSTATE_DISABLED)
};
this.updateRadioState(message, aCallback);
},
getCellInfoList: function(aCallback) {
@ -1134,7 +1222,11 @@ MobileConnectionService.prototype = {
debug("notifyRadioStateChanged for " + aClientId + ": " + aRadioState);
}
this.getItemByServiceId(aClientId).updateRadioState(aRadioState);
let message = {
msgType: "HardwareRadioState",
msgData: aRadioState
};
this.getItemByServiceId(aClientId).updateRadioState(message);
},
notifyNetworkInfoChanged: function(aClientId, aNetworkInfo) {