Fix the build
Revert "am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp"
This reverts commit 352f2c33d3b8a0b73dcdab98c7a77f698578b048, reversing
changes made to ce8a55db6feae11c1db45a868a7d8a0e7d105471.
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 0b0e1ef..12ac052 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -543,8 +543,18 @@
*/
public NetworkInfo getActiveNetworkInfo() {
enforceAccessPermission();
- if (mActiveDefaultNetwork != -1) {
- return mNetTrackers[mActiveDefaultNetwork].getNetworkInfo();
+ for (int type=0; type <= ConnectivityManager.MAX_NETWORK_TYPE; type++) {
+ if (mNetAttributes[type] == null || !mNetAttributes[type].isDefault()) {
+ continue;
+ }
+ NetworkStateTracker t = mNetTrackers[type];
+ NetworkInfo info = t.getNetworkInfo();
+ if (info.isConnected()) {
+ if (DBG && type != mActiveDefaultNetwork) {
+ loge("connected default network is not mActiveDefaultNetwork!");
+ }
+ return info;
+ }
}
return null;
}
@@ -1343,20 +1353,7 @@
handleApplyDefaultProxy(netType);
addDefaultRoute(mNetTrackers[netType]);
} else {
- // many radios add a default route even when we don't want one.
- // remove the default interface unless we need it for our active network
- if (mActiveDefaultNetwork != -1) {
- LinkProperties linkProperties =
- mNetTrackers[mActiveDefaultNetwork].getLinkProperties();
- LinkProperties newLinkProperties =
- mNetTrackers[netType].getLinkProperties();
- String defaultIface = linkProperties.getInterfaceName();
- if (defaultIface != null &&
- !defaultIface.equals(newLinkProperties.getInterfaceName())) {
- mNetTrackers[netType].removeDefaultRoute();
- }
- }
- mNetTrackers[netType].addPrivateDnsRoutes();
+ addPrivateDnsRoutes(mNetTrackers[netType]);
}
} else {
if (mNetAttributes[netType].isDefault()) {