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 897869 - [b2g-ril] Need to keep CLIR settings across reboots. r=vicamo

Browse Source
This commit is contained in:
Jose Antonio Olivera Ortega 2013-07-31 09:56:43 +02:00
parent 220d101a90
commit 59faa9ddc1
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,7 @@ const kTimeNitzAvailable = "time.nitz.available";
const kCellBroadcastSearchList = "ril.cellbroadcast.searchlist";
const kCellBroadcastDisabled = "ril.cellbroadcast.disabled";
const kPrefenceChangedObserverTopic = "nsPref:changed";
const kClirModePreference = "ril.clirMode";
const DOM_MOBILE_MESSAGE_DELIVERY_RECEIVED = "received";
const DOM_MOBILE_MESSAGE_DELIVERY_SENDING = "sending";
@ -562,7 +563,8 @@ function RadioInterfaceLayer() {
let options = {
debug: debugPref,
cellBroadcastDisabled: false
cellBroadcastDisabled: false,
clirMode: RIL.CLIR_DEFAULT
};
try {
@ -570,6 +572,10 @@ function RadioInterfaceLayer() {
Services.prefs.getBoolPref(kCellBroadcastDisabled);
} catch(e) {}
try {
options.clirMode = Services.prefs.getIntPref(kClirModePreference);
} catch(e) {}
let numIfaces = this.numRadioInterfaces;
debug(numIfaces + " interfaces");
this.radioInterfaces = [];
@ -2338,8 +2344,23 @@ RadioInterface.prototype = {
handleSetCLIR: function handleSetCLIR(message) {
if (DEBUG) this.debug("handleSetCLIR: " + JSON.stringify(message));
gMessageManager.sendRequestResults("RIL:SetCallingLineIdRestriction",
message);
let messageType;
if (message.isSendMMI) {
messageType = message.success ? "RIL:SendMMI:Return:OK" :
"RIL:SendMMI:Return:KO";
} else {
messageType = "RIL:SetCallingLineIdRestriction";
}
if (message.success) {
try {
Services.prefs.setIntPref(kClirModePreference, message.clirMode);
Services.prefs.savePrefFile(null);
if (DEBUG) {
this.debug(kClirModePreference + " pref is now " + message.clirMode);
}
} catch (e) {}
}
gMessageManager.sendRequestResults(messageType, message);
},
handleSetRoamingPreference: function handleSetRoamingPreference(message) {

20
dom/system/gonk/ril_worker.js
View File

@ -760,6 +760,11 @@ let RIL = {
*/
cellBroadcastDisabled: false,
/**
* Global CLIR mode settings.
*/
clirMode: CLIR_DEFAULT,
/**
* Parsed Cell Broadcast search lists.
* cellBroadcastConfigs.MMI should be preserved over rild reset.
@ -1501,9 +1506,12 @@ let RIL = {
* nsIDOMMozMobileConnection interface.
*/
setCLIR: function setCLIR(options) {
if (options) {
this.clirMode = options.clirMode;
}
Buf.newParcel(REQUEST_SET_CLIR, options);
Buf.writeUint32(1);
Buf.writeUint32(options.clirMode);
Buf.writeUint32(this.clirMode);
Buf.sendParcel();
},
@ -2548,6 +2556,8 @@ let RIL = {
_sendMMIError(MMI_ERROR_KS_NOT_SUPPORTED, MMI_KS_SC_CLIR);
return;
}
options.rilMessageType = "setCLIR";
options.isSendMMI = true;
this.setCLIR(options);
return;
@ -4663,6 +4673,7 @@ let RIL = {
DEBUG = DEBUG_WORKER || options.debug;
CLIENT_ID = options.clientId;
this.cellBroadcastDisabled = options.cellBroadcastDisabled;
this.clirMode = options.clirMode;
}
};
@ -5164,11 +5175,15 @@ RIL[REQUEST_GET_CLIR] = function REQUEST_GET_CLIR(length, options) {
this.sendChromeMessage(options);
};
RIL[REQUEST_SET_CLIR] = function REQUEST_SET_CLIR(length, options) {
if (options.rilMessageType == null) {
// The request was made by ril_worker itself automatically. Don't report.
return;
}
options.success = (options.rilRequestError === 0);
if (!options.success) {
options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
}
if (options.success && (options.rilMessageType === "sendMMI")) {
if (options.success && options.isSendMMI) {
switch (options.procedure) {
case MMI_PROCEDURE_ACTIVATION:
options.statusMessage = MMI_SM_KS_SERVICE_ENABLED;
@ -5825,6 +5840,7 @@ RIL[UNSOLICITED_RESPONSE_RADIO_STATE_CHANGED] = function UNSOLICITED_RESPONSE_RA
this.getBasebandVersion();
this.updateCellBroadcastConfig();
this.setPreferredNetworkType();
this.setCLIR();
}
this.radioState = newState;