Stop unnecessary tethering reconfigurations
The TetheringConfiguraiton is retrieved at startup and on every
ACTION_CONFIGURATION_CHANGED broadcast. Re-retrieving the config
at every upstream selection is unnecessary and fills up the logs.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug: 32163131
Bug: 63250751
Change-Id: Ia6276ada690aa3e4870bb83dc4bf3ddcddc35e7b
diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index 1bee594..0a9dba7 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -255,6 +255,12 @@
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 @@
}
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);
diff --git a/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java b/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
index 7efa166..acbc10b 100644
--- a/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
+++ b/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
@@ -70,6 +70,7 @@
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 @@
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 @@
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;
}