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

am ddf17b5b: am 8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev

Browse Source 
* commit 'ddf17b5b82f25965502377588483abbc328c4e6d':
  Make CS.isTetheringSupported dynamic
This commit is contained in:
Robert Greenwalt
2013-07-19 13:37:58 -07:00
committed by Android Git Automerger
parent 220695650f 368095f658
commit eb98d8f65f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/ConnectivityService.java
View File

@@ -175,7 +175,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private static final int MAX_HOSTROUTE_CYCLE_COUNT = 10; private static final int MAX_HOSTROUTE_CYCLE_COUNT = 10;
private Tethering mTethering; private Tethering mTethering;
private boolean mTetheringConfigValid = false;
private KeyStore mKeyStore; private KeyStore mKeyStore;
@@ -589,10 +588,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
mTethering = new Tethering(mContext, mNetd, statsService, this, mHandler.getLooper()); mTethering = new Tethering(mContext, mNetd, statsService, this, mHandler.getLooper());
mTetheringConfigValid = ((mTethering.getTetherableUsbRegexs().length != 0 ||
mTethering.getTetherableWifiRegexs().length != 0 ||
mTethering.getTetherableBluetoothRegexs().length != 0) &&
mTethering.getUpstreamIfaceTypes().length != 0);
mVpn = new Vpn(mContext, mVpnCallback, mNetd, this); mVpn = new Vpn(mContext, mVpnCallback, mNetd, this);
mVpn.startMonitoring(mContext, mTrackerHandler); mVpn.startMonitoring(mContext, mTrackerHandler);
@@ -3002,7 +2997,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
int defaultVal = (SystemProperties.get("ro.tether.denied").equals("true") ? 0 : 1); int defaultVal = (SystemProperties.get("ro.tether.denied").equals("true") ? 0 : 1);
boolean tetherEnabledInSettings = (Settings.Global.getInt(mContext.getContentResolver(), boolean tetherEnabledInSettings = (Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.TETHER_SUPPORTED, defaultVal) != 0); Settings.Global.TETHER_SUPPORTED, defaultVal) != 0);
return tetherEnabledInSettings && mTetheringConfigValid; return tetherEnabledInSettings && ((mTethering.getTetherableUsbRegexs().length != 0 ||
mTethering.getTetherableWifiRegexs().length != 0 ||
mTethering.getTetherableBluetoothRegexs().length != 0) &&
mTethering.getUpstreamIfaceTypes().length != 0);
} }
// An API NetworkStateTrackers can call when they lose their network. // An API NetworkStateTrackers can call when they lose their network.