Merge "Stop unnecessary tethering reconfigurations" am: 8ad1c81b07 (626c3e87) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/Tethering.java

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -255,6 +255,12 @@ public class Tethering extends BaseNetworkObserver {
	mUpstreamNetworkMonitor.updateMobileRequiresDun(mConfig.isDunRequired);		mUpstreamNetworkMonitor.updateMobileRequiresDun(mConfig.isDunRequired);
	}		}

			private void maybeUpdateConfiguration() {
			final int dunCheck = TetheringConfiguration.checkDunRequired(mContext);
			if (dunCheck == mConfig.dunCheck) return;
			updateConfiguration();
			}

	@Override		@Override
	public void interfaceStatusChanged(String iface, boolean up) {		public void interfaceStatusChanged(String iface, boolean up) {
	// Never called directly: only called from interfaceLinkStateChanged.		// Never called directly: only called from interfaceLinkStateChanged.
	@@ -1283,7 +1289,9 @@ public class Tethering extends BaseNetworkObserver {
	}		}

	protected void chooseUpstreamType(boolean tryCell) {		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(		final NetworkState ns = mUpstreamNetworkMonitor.selectPreferredUpstreamType(
	mConfig.preferredUpstreamIfaceTypes);		mConfig.preferredUpstreamIfaceTypes);

services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -70,6 +70,7 @@ public class TetheringConfiguration {
	public final String[] tetherableUsbRegexs;		public final String[] tetherableUsbRegexs;
	public final String[] tetherableWifiRegexs;		public final String[] tetherableWifiRegexs;
	public final String[] tetherableBluetoothRegexs;		public final String[] tetherableBluetoothRegexs;
			public final int dunCheck;
	public final boolean isDunRequired;		public final boolean isDunRequired;
	public final Collection<Integer> preferredUpstreamIfaceTypes;		public final Collection<Integer> preferredUpstreamIfaceTypes;
	public final String[] dhcpRanges;		public final String[] dhcpRanges;
	@@ -88,7 +89,7 @@ public class TetheringConfiguration {
	tetherableBluetoothRegexs = ctx.getResources().getStringArray(		tetherableBluetoothRegexs = ctx.getResources().getStringArray(
	com.android.internal.R.array.config_tether_bluetooth_regexs);		com.android.internal.R.array.config_tether_bluetooth_regexs);

	final int dunCheck = checkDunRequired(ctx);		dunCheck = checkDunRequired(ctx);
	configLog.log("DUN check returned: " + dunCheckString(dunCheck));		configLog.log("DUN check returned: " + dunCheckString(dunCheck));

	preferredUpstreamIfaceTypes = getUpstreamIfaceTypes(ctx, dunCheck);		preferredUpstreamIfaceTypes = getUpstreamIfaceTypes(ctx, dunCheck);
	@@ -175,7 +176,7 @@ public class TetheringConfiguration {
	return upstreamNames;		return upstreamNames;
	}		}

	private static int checkDunRequired(Context ctx) {		public static int checkDunRequired(Context ctx) {
	final TelephonyManager tm = (TelephonyManager) ctx.getSystemService(TELEPHONY_SERVICE);		final TelephonyManager tm = (TelephonyManager) ctx.getSystemService(TELEPHONY_SERVICE);
	return (tm != null) ? tm.getTetherApnRequired() : DUN_UNSPECIFIED;		return (tm != null) ? tm.getTetherApnRequired() : DUN_UNSPECIFIED;
	}		}