commit 3effe3a715034e55fd9713cd14ae55f744e090ef
author Mark Chien <markchien@google.com> Tue Dec 11 00:23:36 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Dec 11 00:23:36 2018 -0800
tree c165ad8149052a09c59e34e07ee7071df08ee7df
parent 5da9fe3d79a948184bb377cb55dea4707e9eb5b0
parent fad9571dc59e822d6d59ad163b55799de9d1bc34

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

Change-Id: I9b4ae170dbeda9186dfae256871fa7e790a401e7

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

diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index 3c14393..d75601b 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -944,10 +944,11 @@
     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;
     }