Merge "Tethering: switch to use tethering package resources" (01224e01) · Commits · e / os / android_frameworks_base

packages/Tethering/res/values/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@

		<!-- If the mobile hotspot feature requires provisioning, a package name and class name
		can be provided to launch a supported application that provisions the devices.
		EntitlementManager will send an inent to Settings with the specified package name and
		EntitlementManager will send an intent to Settings with the specified package name and
		class name in extras to launch provision app.
		TODO: note what extras here.

packages/Tethering/src/com/android/server/connectivity/tethering/EntitlementManager.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -27,8 +27,6 @@ import static android.net.TetheringManager.TETHER_ERROR_ENTITLEMENT_UNKONWN;
		import static android.net.TetheringManager.TETHER_ERROR_NO_ERROR;
		import static android.net.TetheringManager.TETHER_ERROR_PROVISION_FAILED;

		import static com.android.internal.R.string.config_wifi_tether_enable;

		import android.app.AlarmManager;
		import android.app.PendingIntent;
		import android.content.BroadcastReceiver;
		@@ -36,7 +34,6 @@ import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.res.Resources;
		import android.net.util.SharedLog;
		import android.os.Bundle;
		import android.os.Handler;
		@@ -54,6 +51,7 @@ import android.util.SparseIntArray;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.StateMachine;
		import com.android.networkstack.tethering.R;

		import java.io.PrintWriter;

		@@ -75,9 +73,7 @@ public class EntitlementManager {
		"com.android.server.connectivity.tethering.PROVISIONING_RECHECK_ALARM";
		private static final String EXTRA_SUBID = "subId";

		// {@link ComponentName} of the Service used to run tether provisioning.
		private static final ComponentName TETHER_SERVICE = ComponentName.unflattenFromString(
		Resources.getSystem().getString(config_wifi_tether_enable));
		private final ComponentName mSilentProvisioningService;
		private static final int MS_PER_HOUR = 60 * 60 * 1000;
		private static final int EVENT_START_PROVISIONING = 0;
		private static final int EVENT_STOP_PROVISIONING = 1;
		@@ -122,6 +118,8 @@ public class EntitlementManager {
		mHandler = new EntitlementHandler(masterHandler.getLooper());
		mContext.registerReceiver(mReceiver, new IntentFilter(ACTION_PROVISIONING_ALARM),
		null, mHandler);
		mSilentProvisioningService = ComponentName.unflattenFromString(
		mContext.getResources().getString(R.string.config_wifi_tether_enable));
		}

		public void setOnUiEntitlementFailedListener(final OnUiEntitlementFailedListener listener) {
		@@ -377,7 +375,7 @@ public class EntitlementManager {
		intent.putExtra(EXTRA_RUN_PROVISION, true);
		intent.putExtra(EXTRA_PROVISION_CALLBACK, receiver);
		intent.putExtra(EXTRA_SUBID, subId);
		intent.setComponent(TETHER_SERVICE);
		intent.setComponent(mSilentProvisioningService);
		// Only admin user can change tethering and SilentTetherProvisioning don't need to
		// show UI, it is fine to always start setting's background service as system user.
		mContext.startService(intent);

packages/Tethering/src/com/android/server/connectivity/tethering/TetheringConfiguration.java

+15 −23

Original line number	Diff line number	Diff line
		@@ -23,18 +23,6 @@ import static android.net.ConnectivityManager.TYPE_MOBILE_DUN;
		import static android.net.ConnectivityManager.TYPE_MOBILE_HIPRI;
		import static android.provider.DeviceConfig.NAMESPACE_CONNECTIVITY;

		import static com.android.internal.R.array.config_mobile_hotspot_provision_app;
		import static com.android.internal.R.array.config_tether_bluetooth_regexs;
		import static com.android.internal.R.array.config_tether_dhcp_range;
		import static com.android.internal.R.array.config_tether_upstream_types;
		import static com.android.internal.R.array.config_tether_usb_regexs;
		import static com.android.internal.R.array.config_tether_wifi_p2p_regexs;
		import static com.android.internal.R.array.config_tether_wifi_regexs;
		import static com.android.internal.R.bool.config_tether_upstream_automatic;
		import static com.android.internal.R.integer.config_mobile_hotspot_provision_check_period;
		import static com.android.internal.R.string.config_mobile_hotspot_provision_app_no_ui;
		import static com.android.networkstack.tethering.R.bool.config_tether_enable_legacy_dhcp_server;

		import android.content.Context;
		import android.content.res.Resources;
		import android.net.TetheringConfigurationParcel;
		@@ -45,6 +33,7 @@ import android.telephony.TelephonyManager;
		import android.text.TextUtils;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.networkstack.tethering.R;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		@@ -113,27 +102,30 @@ public class TetheringConfiguration {
		activeDataSubId = id;
		Resources res = getResources(ctx, activeDataSubId);

		tetherableUsbRegexs = getResourceStringArray(res, config_tether_usb_regexs);
		tetherableUsbRegexs = getResourceStringArray(res, R.array.config_tether_usb_regexs);
		// TODO: Evaluate deleting this altogether now that Wi-Fi always passes
		// us an interface name. Careful consideration needs to be given to
		// implications for Settings and for provisioning checks.
		tetherableWifiRegexs = getResourceStringArray(res, config_tether_wifi_regexs);
		tetherableWifiP2pRegexs = getResourceStringArray(res, config_tether_wifi_p2p_regexs);
		tetherableBluetoothRegexs = getResourceStringArray(res, config_tether_bluetooth_regexs);
		tetherableWifiRegexs = getResourceStringArray(res, R.array.config_tether_wifi_regexs);
		tetherableWifiP2pRegexs = getResourceStringArray(
		res, R.array.config_tether_wifi_p2p_regexs);
		tetherableBluetoothRegexs = getResourceStringArray(
		res, R.array.config_tether_bluetooth_regexs);

		isDunRequired = checkDunRequired(ctx);

		chooseUpstreamAutomatically = getResourceBoolean(res, config_tether_upstream_automatic);
		chooseUpstreamAutomatically = getResourceBoolean(
		res, R.bool.config_tether_upstream_automatic);
		preferredUpstreamIfaceTypes = getUpstreamIfaceTypes(res, isDunRequired);

		legacyDhcpRanges = getLegacyDhcpRanges(res);
		defaultIPv4DNS = copy(DEFAULT_IPV4_DNS);
		enableLegacyDhcpServer = getEnableLegacyDhcpServer(res);

		provisioningApp = getResourceStringArray(res, config_mobile_hotspot_provision_app);
		provisioningApp = getResourceStringArray(res, R.array.config_mobile_hotspot_provision_app);
		provisioningAppNoUi = getProvisioningAppNoUi(res);
		provisioningCheckPeriod = getResourceInteger(res,
		config_mobile_hotspot_provision_check_period,
		R.integer.config_mobile_hotspot_provision_check_period,
		0 /* No periodic re-check */);

		configLog.log(toString());
		@@ -248,7 +240,7 @@ public class TetheringConfiguration {
		}

		private static Collection<Integer> getUpstreamIfaceTypes(Resources res, boolean dunRequired) {
		final int[] ifaceTypes = res.getIntArray(config_tether_upstream_types);
		final int[] ifaceTypes = res.getIntArray(R.array.config_tether_upstream_types);
		final ArrayList<Integer> upstreamIfaceTypes = new ArrayList<>(ifaceTypes.length);
		for (int i : ifaceTypes) {
		switch (i) {
		@@ -298,7 +290,7 @@ public class TetheringConfiguration {
		}

		private static String[] getLegacyDhcpRanges(Resources res) {
		final String[] fromResource = getResourceStringArray(res, config_tether_dhcp_range);
		final String[] fromResource = getResourceStringArray(res, R.array.config_tether_dhcp_range);
		if ((fromResource.length > 0) && (fromResource.length % 2 == 0)) {
		return fromResource;
		}
		@@ -307,7 +299,7 @@ public class TetheringConfiguration {

		private static String getProvisioningAppNoUi(Resources res) {
		try {
		return res.getString(config_mobile_hotspot_provision_app_no_ui);
		return res.getString(R.string.config_mobile_hotspot_provision_app_no_ui);
		} catch (Resources.NotFoundException e) {
		return "";
		}
		@@ -339,7 +331,7 @@ public class TetheringConfiguration {
		}

		private boolean getEnableLegacyDhcpServer(final Resources res) {
		return getResourceBoolean(res, config_tether_enable_legacy_dhcp_server)
		return getResourceBoolean(res, R.bool.config_tether_enable_legacy_dhcp_server)
		\|\| getDeviceConfigBoolean(TETHER_ENABLE_LEGACY_DHCP_SERVER);
		}

packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/EntitlementManagerTest.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;

		import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
		import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
		import static com.android.networkstack.tethering.R.bool.config_tether_enable_legacy_dhcp_server;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		@@ -56,10 +55,10 @@ import android.telephony.CarrierConfigManager;
		import androidx.test.filters.SmallTest;
		import androidx.test.runner.AndroidJUnit4;

		import com.android.internal.R;
		import com.android.internal.util.State;
		import com.android.internal.util.StateMachine;
		import com.android.internal.util.test.BroadcastInterceptingContext;
		import com.android.networkstack.tethering.R;

		import org.junit.After;
		import org.junit.Before;
		@@ -166,7 +165,9 @@ public final class EntitlementManagerTest {
		.thenReturn(new String[0]);
		when(mResources.getIntArray(R.array.config_tether_upstream_types))
		.thenReturn(new int[0]);
		when(mResources.getBoolean(config_tether_enable_legacy_dhcp_server)).thenReturn(false);
		when(mResources.getBoolean(R.bool.config_tether_enable_legacy_dhcp_server)).thenReturn(
		false);
		when(mResources.getString(R.string.config_wifi_tether_enable)).thenReturn("");
		when(mLog.forSubComponent(anyString())).thenReturn(mLog);

		mMockContext = new MockContext(mContext);

packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/TetheringConfigurationTest.java

+28 −27

Original line number	Diff line number	Diff line
		@@ -26,13 +26,6 @@ import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;

		import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
		import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
		import static com.android.internal.R.array.config_mobile_hotspot_provision_app;
		import static com.android.internal.R.array.config_tether_bluetooth_regexs;
		import static com.android.internal.R.array.config_tether_dhcp_range;
		import static com.android.internal.R.array.config_tether_upstream_types;
		import static com.android.internal.R.array.config_tether_usb_regexs;
		import static com.android.internal.R.array.config_tether_wifi_regexs;
		import static com.android.networkstack.tethering.R.bool.config_tether_enable_legacy_dhcp_server;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		@@ -51,6 +44,7 @@ import androidx.test.filters.SmallTest;
		import androidx.test.runner.AndroidJUnit4;

		import com.android.internal.util.test.BroadcastInterceptingContext;
		import com.android.networkstack.tethering.R;

		import org.junit.After;
		import org.junit.Before;
		@@ -120,15 +114,18 @@ public class TetheringConfigurationTest {
		() -> DeviceConfig.getBoolean(eq(NAMESPACE_CONNECTIVITY),
		eq(TetheringConfiguration.TETHER_ENABLE_LEGACY_DHCP_SERVER), anyBoolean()));

		when(mResources.getStringArray(config_tether_dhcp_range)).thenReturn(new String[0]);
		when(mResources.getStringArray(config_tether_usb_regexs)).thenReturn(new String[0]);
		when(mResources.getStringArray(config_tether_wifi_regexs))
		when(mResources.getStringArray(R.array.config_tether_dhcp_range)).thenReturn(
		new String[0]);
		when(mResources.getStringArray(R.array.config_tether_usb_regexs)).thenReturn(new String[0]);
		when(mResources.getStringArray(R.array.config_tether_wifi_regexs))
		.thenReturn(new String[]{ "test_wlan\\d" });
		when(mResources.getStringArray(config_tether_bluetooth_regexs)).thenReturn(new String[0]);
		when(mResources.getIntArray(config_tether_upstream_types)).thenReturn(new int[0]);
		when(mResources.getStringArray(config_mobile_hotspot_provision_app))
		when(mResources.getStringArray(R.array.config_tether_bluetooth_regexs)).thenReturn(
		new String[0]);
		when(mResources.getIntArray(R.array.config_tether_upstream_types)).thenReturn(new int[0]);
		when(mResources.getStringArray(R.array.config_mobile_hotspot_provision_app))
		.thenReturn(new String[0]);
		when(mResources.getBoolean(config_tether_enable_legacy_dhcp_server)).thenReturn(false);
		when(mResources.getBoolean(R.bool.config_tether_enable_legacy_dhcp_server)).thenReturn(
		false);
		mHasTelephonyManager = true;
		mMockContext = new MockContext(mContext);
		mEnableLegacyDhcpServer = false;
		@@ -140,7 +137,7 @@ public class TetheringConfigurationTest {
		}

		private TetheringConfiguration getTetheringConfiguration(int... legacyTetherUpstreamTypes) {
		when(mResources.getIntArray(config_tether_upstream_types)).thenReturn(
		when(mResources.getIntArray(R.array.config_tether_upstream_types)).thenReturn(
		legacyTetherUpstreamTypes);
		return new TetheringConfiguration(mMockContext, mLog, INVALID_SUBSCRIPTION_ID);
		}
		@@ -224,7 +221,7 @@ public class TetheringConfigurationTest {

		@Test
		public void testNoDefinedUpstreamTypesAddsEthernet() {
		when(mResources.getIntArray(config_tether_upstream_types)).thenReturn(new int[]{});
		when(mResources.getIntArray(R.array.config_tether_upstream_types)).thenReturn(new int[]{});
		when(mTelephonyManager.isTetheringApnRequired()).thenReturn(false);

		final TetheringConfiguration cfg = new TetheringConfiguration(
		@@ -246,7 +243,7 @@ public class TetheringConfigurationTest {

		@Test
		public void testDefinedUpstreamTypesSansEthernetAddsEthernet() {
		when(mResources.getIntArray(config_tether_upstream_types)).thenReturn(
		when(mResources.getIntArray(R.array.config_tether_upstream_types)).thenReturn(
		new int[]{TYPE_WIFI, TYPE_MOBILE_HIPRI});
		when(mTelephonyManager.isTetheringApnRequired()).thenReturn(false);

		@@ -264,7 +261,7 @@ public class TetheringConfigurationTest {

		@Test
		public void testDefinedUpstreamTypesWithEthernetDoesNotAddEthernet() {
		when(mResources.getIntArray(config_tether_upstream_types))
		when(mResources.getIntArray(R.array.config_tether_upstream_types))
		.thenReturn(new int[]{TYPE_WIFI, TYPE_ETHERNET, TYPE_MOBILE_HIPRI});
		when(mTelephonyManager.isTetheringApnRequired()).thenReturn(false);

		@@ -282,7 +279,8 @@ public class TetheringConfigurationTest {

		@Test
		public void testNewDhcpServerDisabled() {
		when(mResources.getBoolean(config_tether_enable_legacy_dhcp_server)).thenReturn(true);
		when(mResources.getBoolean(R.bool.config_tether_enable_legacy_dhcp_server)).thenReturn(
		true);
		doReturn(false).when(
		() -> DeviceConfig.getBoolean(eq(NAMESPACE_CONNECTIVITY),
		eq(TetheringConfiguration.TETHER_ENABLE_LEGACY_DHCP_SERVER), anyBoolean()));
		@@ -291,7 +289,8 @@ public class TetheringConfigurationTest {
		new TetheringConfiguration(mMockContext, mLog, INVALID_SUBSCRIPTION_ID);
		assertTrue(enableByRes.enableLegacyDhcpServer);

		when(mResources.getBoolean(config_tether_enable_legacy_dhcp_server)).thenReturn(false);
		when(mResources.getBoolean(R.bool.config_tether_enable_legacy_dhcp_server)).thenReturn(
		false);
		doReturn(true).when(
		() -> DeviceConfig.getBoolean(eq(NAMESPACE_CONNECTIVITY),
		eq(TetheringConfiguration.TETHER_ENABLE_LEGACY_DHCP_SERVER), anyBoolean()));
		@@ -303,7 +302,8 @@ public class TetheringConfigurationTest {

		@Test
		public void testNewDhcpServerEnabled() {
		when(mResources.getBoolean(config_tether_enable_legacy_dhcp_server)).thenReturn(false);
		when(mResources.getBoolean(R.bool.config_tether_enable_legacy_dhcp_server)).thenReturn(
		false);
		doReturn(false).when(
		() -> DeviceConfig.getBoolean(eq(NAMESPACE_CONNECTIVITY),
		eq(TetheringConfiguration.TETHER_ENABLE_LEGACY_DHCP_SERVER), anyBoolean()));
		@@ -329,16 +329,17 @@ public class TetheringConfigurationTest {

		private void setUpResourceForSubId() {
		when(mResourcesForSubId.getStringArray(
		config_tether_dhcp_range)).thenReturn(new String[0]);
		R.array.config_tether_dhcp_range)).thenReturn(new String[0]);
		when(mResourcesForSubId.getStringArray(
		config_tether_usb_regexs)).thenReturn(new String[0]);
		R.array.config_tether_usb_regexs)).thenReturn(new String[0]);
		when(mResourcesForSubId.getStringArray(
		config_tether_wifi_regexs)).thenReturn(new String[]{ "test_wlan\\d" });
		R.array.config_tether_wifi_regexs)).thenReturn(new String[]{ "test_wlan\\d" });
		when(mResourcesForSubId.getStringArray(
		config_tether_bluetooth_regexs)).thenReturn(new String[0]);
		when(mResourcesForSubId.getIntArray(config_tether_upstream_types)).thenReturn(new int[0]);
		R.array.config_tether_bluetooth_regexs)).thenReturn(new String[0]);
		when(mResourcesForSubId.getIntArray(R.array.config_tether_upstream_types)).thenReturn(
		new int[0]);
		when(mResourcesForSubId.getStringArray(
		config_mobile_hotspot_provision_app)).thenReturn(PROVISIONING_APP_NAME);
		R.array.config_mobile_hotspot_provision_app)).thenReturn(PROVISIONING_APP_NAME);
		}

		}