LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "More concisely export whether we have a "tetherable configuration""

Browse Source 
am: 1f2437c65a

Change-Id: I5f9717c9dab6b39f1fbf2186107b2a1f3f2d4f8f
This commit is contained in:
Erik Kline
2017-01-23 07:13:56 +00:00
committed by android-build-merger
parent dfcad2252b 1f2437c65a
commit b0949a3ede
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -3094,10 +3094,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
Settings.Global.TETHER_SUPPORTED, defaultVal) != 0) Settings.Global.TETHER_SUPPORTED, defaultVal) != 0)
&& !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING); && !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING);
return tetherEnabledInSettings && mUserManager.isAdminUser() && return tetherEnabledInSettings && mUserManager.isAdminUser() &&
((mTethering.getTetherableUsbRegexs().length != 0 || mTethering.hasTetherableConfiguration();
mTethering.getTetherableWifiRegexs().length != 0 ||
mTethering.getTetherableBluetoothRegexs().length != 0) &&
mTethering.getUpstreamIfaceTypes().length != 0);
} }
@Override @Override