commit 94260caf2fb3f5dbf6e17b29a269b46ea05f8680
author TK MUN <tk.mun@samsung.com> Wed May 18 18:30:48 2011 +0900
committer Simon Wilson <simonwilson@google.com> Wed May 25 10:32:06 2011 -0700
tree 16afdf2b64061a927de7b0c0c49c7a250fa0a068
parent c9cd2387b6938a6fbefc731d2177902266f2a130

Allow control over search order for tethering upstream interface selection

Change-Id: If02c9b2bb61b68ebafafadc23ba17a332bc8004f
Signed-off-by: TK MUN <tk.mun@samsung.com>

core/res/res/values/config.xml

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4433b64..f3cc2bb 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -125,6 +125,7 @@
 
     <!-- Regex array of allowable upstream ifaces for tethering - for example if you want
          tethering on a new interface called "foo2" add <item>"foo\\d"</item> to the array -->
+    <!-- Interfaces will be prioritized according to the order listed -->
     <string-array translatable="false" name="config_tether_upstream_regexs">
     </string-array>
 

services/java/com/android/server/connectivity/Tethering.java

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 @@
                     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;