commit c60a627c0077f8aaa50952ef45175695a6b59ba8
author Robert Greenwalt <robdroid@android.com> Thu Jan 12 09:26:33 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 12 09:26:33 2012 -0800
tree ef8b4a4247adc7339fb7de54051c41d7c9ab96a3
parent d712248e4e447a42a32afa4880892ade4eb439ae
parent 4b1261f17ae2a0180be09b1c987ec7e70b2b46a7

am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1

* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
  Disable wimax when mobile data is in Settings

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 6e4aca7..97fb0b0 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1431,6 +1431,12 @@
             }
             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