Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60a31178 authored by TK MUN's avatar TK MUN Committed by Android Git Automerger
Browse files

am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for... 

am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection

* commit '51704fc9':
  Allow control over search order for tethering upstream interface selection
parents a959c8ff 51704fc9

core/res/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,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

+2 −2
Original line number Diff line number Diff line
@@ -1212,8 +1212,8 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 
                    return null;

                }



                for (String iface : ifaces) {

                for (String regex : mUpstreamIfaceRegexs) {

                    for (String iface : ifaces) {

                        if (iface.matches(regex)) {

                            // verify it is active

                            InterfaceConfiguration ifcg = null;