diff options
| author | Robert Greenwalt <robdroid@android.com> | 2012-01-12 09:24:45 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-12 09:24:45 -0800 |
| commit | 4b1261f17ae2a0180be09b1c987ec7e70b2b46a7 (patch) | |
| tree | 06954c77300120fc643b1ceac02e06b1067adb66 /services/java | |
| parent | 2931d8ace9118bafe08090cd41e235048b6c2eb2 (diff) | |
| parent | b97d34c7c81ed7def6d0c1d7a76d057051f7d154 (diff) | |
| download | frameworks_base-4b1261f17ae2a0180be09b1c987ec7e70b2b46a7.zip frameworks_base-4b1261f17ae2a0180be09b1c987ec7e70b2b46a7.tar.gz frameworks_base-4b1261f17ae2a0180be09b1c987ec7e70b2b46a7.tar.bz2 | |
Merge "Disable wimax when mobile data is in Settings" into ics-mr1
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 6 |
1 files changed, 6 insertions, 0 deletions
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 @@ 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 |