Bug 1030810 - Fix logic in updateRILNetworkInterface(). r=edgar, a=2.0+
authorJessica Jong <jjong@mozilla.com>
Thu, 10 Jul 2014 18:14:03 +0800
changeset 208945 baef22b16b6929dd110dee899a0834af52b6fb38
parent 208944 629db6ea47881f7dac3491fcaac2914a227c7a90
child 208946 7400f692f22752994599f6954bf50c1fbd0ba3d9
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersedgar, 2
bugs1030810
milestone32.0a2
Bug 1030810 - Fix logic in updateRILNetworkInterface(). r=edgar, a=2.0+
dom/system/gonk/RadioInterfaceLayer.js
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -1338,25 +1338,25 @@ DataConnectionHandler.prototype = {
          (dataInfo.roaming && !this.dataCallSettings.roamingEnabled))) {
       if (DEBUG) {
         this.debug("Data call settings: disconnect data call.");
       }
       networkInterface.disconnect();
       return;
     }
 
-    if (defaultDataCallConnected && wifi_active) {
+    if (networkInterface.enabled && wifi_active) {
       if (DEBUG) {
         this.debug("Disconnect data call when Wifi is connected.");
       }
       networkInterface.disconnect();
       return;
     }
 
-    if (!this.dataCallSettings.enabled || networkInterface.enabled) {
+    if (!this.dataCallSettings.enabled || defaultDataCallConnected) {
       if (DEBUG) {
         this.debug("Data call settings: nothing to do.");
       }
       return;
     }
     if (dataInfo.roaming && !this.dataCallSettings.roamingEnabled) {
       if (DEBUG) {
         this.debug("We're roaming, but data roaming is disabled.");