commit 331c68201ca42c0a70d09cb4655d188604f6d443
author The Android Automerger <android-build@android.com> Thu Jan 12 14:01:29 2012 -0800
committer The Android Automerger <android-build@android.com> Thu Jan 12 14:01:29 2012 -0800
tree 8b4a0cb569451719596c6f1dab2b7a37c57e5999
parent 5eee104218f9a505988fbb8359e95a3d578e7e78
parent cfdfbf9fe5655bbd4db29c778ec2a11e5a9beb76

merge in ics-mr1-release history after reset to ics-mr1

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