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

Commit 0e8bcbfe authored by Mark Chien's avatar Mark Chien Committed by android-build-merger
Browse files

Merge "Upstream Configuration should also consider automatic configuration" am: fad9571d 

am: 3effe3a7

Change-Id: I19b2024dd7510dcbf9d17733c056a704e270ab94
parents 3b74db27 3effe3a7

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;

    }