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

Commit fad9571d authored by Mark Chien's avatar Mark Chien Committed by Gerrit Code Review
Browse files

Merge "Upstream Configuration should also consider automatic configuration"

parents f3935f02 1be8d8fc

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

+5 −4
Original line number Diff line number Diff line
@@ -944,10 +944,11 @@ public class Tethering extends BaseNetworkObserver { 
    public boolean hasTetherableConfiguration() {

        final TetheringConfiguration cfg = mConfig;

        final boolean hasDownstreamConfiguration =

                (cfg.tetherableUsbRegexs.length != 0) ||

                (cfg.tetherableWifiRegexs.length != 0) ||

                (cfg.tetherableBluetoothRegexs.length != 0);

        final boolean hasUpstreamConfiguration = !cfg.preferredUpstreamIfaceTypes.isEmpty();

                (cfg.tetherableUsbRegexs.length != 0)

                || (cfg.tetherableWifiRegexs.length != 0)

                || (cfg.tetherableBluetoothRegexs.length != 0);

        final boolean hasUpstreamConfiguration = !cfg.preferredUpstreamIfaceTypes.isEmpty()

                || cfg.chooseUpstreamAutomatically;



        return hasDownstreamConfiguration && hasUpstreamConfiguration;

    }