summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/connectivity
diff options
context:
space:
mode:
authorTK MUN <tk.mun@samsung.com>2011-05-18 18:30:48 +0900
committerSimon Wilson <simonwilson@google.com>2011-05-25 10:32:06 -0700
commit94260caf2fb3f5dbf6e17b29a269b46ea05f8680 (patch)
tree16afdf2b64061a927de7b0c0c49c7a250fa0a068 /services/java/com/android/server/connectivity
parentc9cd2387b6938a6fbefc731d2177902266f2a130 (diff)
downloadframeworks_base-94260caf2fb3f5dbf6e17b29a269b46ea05f8680.zip
frameworks_base-94260caf2fb3f5dbf6e17b29a269b46ea05f8680.tar.gz
frameworks_base-94260caf2fb3f5dbf6e17b29a269b46ea05f8680.tar.bz2
Allow control over search order for tethering upstream interface selection
Change-Id: If02c9b2bb61b68ebafafadc23ba17a332bc8004f Signed-off-by: TK MUN <tk.mun@samsung.com>
Diffstat (limited to 'services/java/com/android/server/connectivity')
-rw-r--r--services/java/com/android/server/connectivity/Tethering.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java
index 1ec9b51..a430128 100644
--- a/services/java/com/android/server/connectivity/Tethering.java
+++ b/services/java/com/android/server/connectivity/Tethering.java
@@ -1170,8 +1170,8 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
return null;
}
- for (String iface : ifaces) {
- for (String regex : mUpstreamIfaceRegexs) {
+ for (String regex : mUpstreamIfaceRegexs) {
+ for (String iface : ifaces) {
if (iface.matches(regex)) {
// verify it is active
InterfaceConfiguration ifcg = null;