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 835729 - Part 1: Fix updating operator's info. r=allstars.chh

Browse Source
This commit is contained in:
Edgar Chen 2013-01-29 15:25:30 +08:00
parent 7b2f3bc32d
commit 94a26edf37
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3075,6 +3075,24 @@ let RIL = {
this.operator.shortName !== shortName ||
thisTuple !== networkTuple) {
this.operator.mcc = 0;
this.operator.mnc = 0;
if (networkTuple) {
try {
this._processNetworkTuple(networkTuple, this.operator);
} catch (e) {
debug("Error processing operator tuple: " + e);
}
} else {
// According to ril.h, the operator fields will be NULL when the operator
// is not currently registered. We can avoid trying to parse the numeric
// tuple in that case.
if (DEBUG) {
debug("Operator is currently unregistered");
}
}
let networkName = this.updateNetworkName();
if (networkName) {
this.operator.longName = networkName.fullName;
@ -3084,23 +3102,6 @@ let RIL = {
this.operator.shortName = shortName;
}
this.operator.mcc = 0;
this.operator.mnc = 0;
// According to ril.h, the operator fields will be NULL when the operator
// is not currently registered. We can avoid trying to parse the numeric
// tuple in that case.
if (DEBUG && !longName) {
debug("Operator is currently unregistered");
}
if (networkTuple) {
try {
this._processNetworkTuple(networkTuple, this.operator);
} catch (e) {
debug("Error processing operator tuple: " + e);
}
}
if (ICCUtilsHelper.updateDisplayCondition()) {
ICCUtilsHelper.handleICCInfoChange();
}