summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-03-30 09:30:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-30 09:30:32 -0700
commit11ebb6f5020761b9b8373a5e0d777fb91a2b92c2 (patch)
treee222107253cc5a87791722373ea6d23941cb3b62 /services
parentce6766ea51a943b9f8908cb18d0d9762497b478c (diff)
parent05f14e2bcf78be62b35e85902408ea66103a3881 (diff)
downloadframeworks_base-11ebb6f5020761b9b8373a5e0d777fb91a2b92c2.zip
frameworks_base-11ebb6f5020761b9b8373a5e0d777fb91a2b92c2.tar.gz
frameworks_base-11ebb6f5020761b9b8373a5e0d777fb91a2b92c2.tar.bz2
am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '05f14e2bcf78be62b35e85902408ea66103a3881': DO NOT MERGE Pick upstream intf with valid IP conf
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/connectivity/Tethering.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java
index f774b29..1ec9b51 100644
--- a/services/java/com/android/server/connectivity/Tethering.java
+++ b/services/java/com/android/server/connectivity/Tethering.java
@@ -1173,18 +1173,18 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
for (String iface : ifaces) {
for (String regex : mUpstreamIfaceRegexs) {
if (iface.matches(regex)) {
- // verify it is up!
+ // verify it is active
InterfaceConfiguration ifcg = null;
try {
ifcg = service.getInterfaceConfig(iface);
+ if (ifcg.isActive()) {
+ return iface;
+ }
} catch (Exception e) {
Log.e(TAG, "Error getting iface config :" + e);
// ignore - try next
continue;
}
- if (ifcg.interfaceFlags.contains("up")) {
- return iface;
- }
}
}
}