Bug 821181 - Setting call waiting status only when user manually sets the value. r=allstars.chh
authorHsin-Yi Tsai <htsai@mozilla.com>
Thu, 13 Dec 2012 15:03:35 +0800
changeset 125863 757dbace7953c5453ab08aceaea885db1ecb7879
parent 125862 f74a7c3f78f28d669ab3465a34a854ed4a3aac3b
child 125864 b323378d9d2764536065cb5f59310901562e1015
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersallstars
bugs821181
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 821181 - Setting call waiting status only when user manually sets the value. r=allstars.chh
dom/system/gonk/RadioInterfaceLayer.js
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -265,19 +265,16 @@ function RadioInterfaceLayer() {
   lock.get("ril.mms.mmsproxy", this);
   lock.get("ril.mms.mmsport", this);
   lock.get("ril.supl.apn", this);
   lock.get("ril.supl.user", this);
   lock.get("ril.supl.passwd", this);
   lock.get("ril.supl.httpProxyHost", this);
   lock.get("ril.supl.httpProxyPort", this);
 
-  // Read the desired setting of call waiting from the settings DB.
-  lock.get("ril.callwaiting.enabled", this);
-
   // Read the 'time.nitz.automatic-update.enabled' setting to see if
   // we need to adjust the system clock time and time zone by NITZ.
   lock.get(kTimeNitzAutomaticUpdateEnabled, this);
 
   // Read the Cell Broadcast Search List setting, string of integers or integer
   // ranges separated by comma, to set listening channels.
   lock.get(kCellBroadcastSearchList, this);
 
@@ -825,22 +822,16 @@ RadioInterfaceLayer.prototype = {
     voiceInfo.connected = newInfo.connected;
     voiceInfo.roaming = newInfo.roaming;
     voiceInfo.emergencyCallsOnly = newInfo.emergencyCallsOnly;
     // Unlike the data registration info, the voice info typically contains
     // no (useful) radio tech information, so we have to manually set
     // this here. (TODO GSM only for now, see bug 726098.)
     voiceInfo.type = "gsm";
 
-    // Ensure the call waiting status once the voice network connects.
-    if (voiceInfo.connected && this.callWaitingStatus == null) {
-      // The call waiting status has not been updated yet. Update that.
-      this.setCallWaitingEnabled(this._callWaitingEnabled);
-    }
-
     // Make sure we also reset the operator and signal strength information
     // if we drop off the network.
     if (newInfo.regState == RIL.NETWORK_CREG_STATE_UNKNOWN) {
       voiceInfo.network = null;
       voiceInfo.signalStrength = null;
       voiceInfo.relSignalStrength = null;
     }
 
@@ -1089,17 +1080,17 @@ RadioInterfaceLayer.prototype = {
     debug("Current call waiting status is " + this.callWaitingStatus +
           ", desired call waiting status is " + value);
     if (!this.rilContext.voice.connected) {
       // The voice network is not connected. Wait for that.
       return;
     }
 
     if (value == null) {
-      // We haven't read the initial value from the settings DB yet.
+      // We haven't read the valid value from the settings DB yet.
       // Wait for that.
       return;
     }
 
     if (this.callWaitingStatus != value) {
       debug("Setting call waiting status to " + value);
       this.worker.postMessage({rilMessageType: "setCallWaiting", enabled: value});
     }