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

Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev

Browse Source 
am: 49a16f0998

Change-Id: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264
This commit is contained in:
Erik Kline
2017-07-12 14:51:35 +00:00
committed by android-build-merger
parent 154bcbe518 49a16f0998
commit e49c3675fe
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,6 +255,12 @@ public class Tethering extends BaseNetworkObserver {
mUpstreamNetworkMonitor.updateMobileRequiresDun(mConfig.isDunRequired);
}
private void maybeUpdateConfiguration() {
final int dunCheck = TetheringConfiguration.checkDunRequired(mContext);
if (dunCheck == mConfig.dunCheck) return;
updateConfiguration();
}
@Override
public void interfaceStatusChanged(String iface, boolean up) {
// Never called directly: only called from interfaceLinkStateChanged.
@@ -1283,7 +1289,9 @@ public class Tethering extends BaseNetworkObserver {
}
protected void chooseUpstreamType(boolean tryCell) {
updateConfiguration(); // TODO - remove?
// We rebuild configuration on ACTION_CONFIGURATION_CHANGED, but we
// do not currently know how to watch for changes in DUN settings.
maybeUpdateConfiguration();
final NetworkState ns = mUpstreamNetworkMonitor.selectPreferredUpstreamType(
mConfig.preferredUpstreamIfaceTypes);

5
services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
View File

@@ -70,6 +70,7 @@ public class TetheringConfiguration {
public final String[] tetherableUsbRegexs;
public final String[] tetherableWifiRegexs;
public final String[] tetherableBluetoothRegexs;
public final int dunCheck;
public final boolean isDunRequired;
public final Collection<Integer> preferredUpstreamIfaceTypes;
public final String[] dhcpRanges;
@@ -88,7 +89,7 @@ public class TetheringConfiguration {
tetherableBluetoothRegexs = ctx.getResources().getStringArray(
com.android.internal.R.array.config_tether_bluetooth_regexs);
final int dunCheck = checkDunRequired(ctx);
dunCheck = checkDunRequired(ctx);
configLog.log("DUN check returned: " + dunCheckString(dunCheck));
preferredUpstreamIfaceTypes = getUpstreamIfaceTypes(ctx, dunCheck);
@@ -175,7 +176,7 @@ public class TetheringConfiguration {
return upstreamNames;
}
private static int checkDunRequired(Context ctx) {
public static int checkDunRequired(Context ctx) {
final TelephonyManager tm = (TelephonyManager) ctx.getSystemService(TELEPHONY_SERVICE);
return (tm != null) ? tm.getTetherApnRequired() : DUN_UNSPECIFIED;
}