From 29552095e19e3faf2006ac1051da41d9bd212d6f Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Mon, 17 Jan 2011 12:38:30 -0800 Subject: Pick an upstream interface with valid IP config As a work around for the issue of picking the wrong interface, add a check for selecting an upstream interface that has a valid IP configuration Bug: 3362306 Change-Id: I01084517cff756c97660b2cfbfa8e9bf26673148 --- services/java/com/android/server/connectivity/Tethering.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'services/java/com') diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java index 134b91e..dd9db9a 100644 --- a/services/java/com/android/server/connectivity/Tethering.java +++ b/services/java/com/android/server/connectivity/Tethering.java @@ -1233,18 +1233,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; - } } } } -- cgit v1.1