Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Upstream Configuration should also consider automatic configuration"

Browse Source 
am: fad9571dc5

Change-Id: I9b4ae170dbeda9186dfae256871fa7e790a401e7
This commit is contained in:
Mark Chien
2018-12-11 00:23:36 -08:00
committed by android-build-merger
parent 5da9fe3d79 fad9571dc5
commit 3effe3a715
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -944,10 +944,11 @@ public class Tethering extends BaseNetworkObserver {
public boolean hasTetherableConfiguration() { public boolean hasTetherableConfiguration() {
final TetheringConfiguration cfg = mConfig; final TetheringConfiguration cfg = mConfig;
final boolean hasDownstreamConfiguration = final boolean hasDownstreamConfiguration =
(cfg.tetherableUsbRegexs.length != 0) || (cfg.tetherableUsbRegexs.length != 0)
(cfg.tetherableWifiRegexs.length != 0) || || (cfg.tetherableWifiRegexs.length != 0)
(cfg.tetherableBluetoothRegexs.length != 0); || (cfg.tetherableBluetoothRegexs.length != 0);
final boolean hasUpstreamConfiguration = !cfg.preferredUpstreamIfaceTypes.isEmpty(); final boolean hasUpstreamConfiguration = !cfg.preferredUpstreamIfaceTypes.isEmpty()
|| cfg.chooseUpstreamAutomatically;
return hasDownstreamConfiguration && hasUpstreamConfiguration; return hasDownstreamConfiguration && hasUpstreamConfiguration;
} }