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

Robert Greenwalt · Android Git Automerger · commit 1800ccfa647c · 2012-01-12T09:26:48.000-08:00
* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
  Disable wimax when mobile data is in Settings
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
@@ -1431,6 +1431,12 @@ private void handleSetMobileData(boolean enabled) {
             }
             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

Original file line number	Diff line number	Diff line change
`@@ -1431,6 +1431,12 @@ private void handleSetMobileData(boolean enabled) {`
`1431`	`1431`	`}`
`1432`	`1432`	`mNetTrackers[ConnectivityManager.TYPE_MOBILE].setUserDataEnable(enabled);`
`1433`	`1433`	`}`
	`1434`	`+ if (mNetTrackers[ConnectivityManager.TYPE_WIMAX] != null) {`
	`1435`	`+ if (VDBG) {`
	`1436`	`+ log(mNetTrackers[ConnectivityManager.TYPE_WIMAX].toString() + enabled);`
	`1437`	`+ }`
	`1438`	`+ mNetTrackers[ConnectivityManager.TYPE_WIMAX].setUserDataEnable(enabled);`
	`1439`	`+ }`
`1434`	`1440`	`}`
`1435`	`1441`
`1436`	`1442`	`@Override`