Merge "Disable wimax when mobile data is in Settings" into ics-mr1

2012-01-12 09:24:45 -08:00
parent 2931d8ace9 b97d34c7c8
commit 4b1261f17a
1 changed files with 6 additions and 0 deletions
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1431,6 +1431,12 @@ private NetworkStateTracker makeWimaxStateTracker() {
            }
            mNetTrackers[ConnectivityManager.TYPE_MOBILE].setUserDataEnable(enabled);
        }
+        if (mNetTrackers[ConnectivityManager.TYPE_WIMAX] != null) {
+            if (VDBG) {
+                log(mNetTrackers[ConnectivityManager.TYPE_WIMAX].toString() + enabled);
+            }
+            mNetTrackers[ConnectivityManager.TYPE_WIMAX].setUserDataEnable(enabled);
+        }
    }

    @Override