commit 6ed1f684fd4941d1a37b1a374bae5b957eb5162a
author Robert Greenwalt <robdroid@android.com> Thu Jan 12 09:29:30 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 12 09:29:30 2012 -0800
tree 114b5ec3672111b514c238cf8e53ceef6cd0d05b
parent 1be767cf7478bb2fbdac878e29f1998d4a2edf57
parent 21eba066e5c50e20f9beb036336fa832c7a92509

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

* commit '21eba066e5c50e20f9beb036336fa832c7a92509':
  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