From 23a5f18adbbabea530456d39289b14213f06c515 Mon Sep 17 00:00:00 2001 From: markchien Date: Wed, 2 Mar 2022 21:54:55 +0800 Subject: [PATCH] Remove tether_enable_select_all_prefix_ranges flag The tether_enable_select_all_prefix_ranges is added from M2020-12 for quick roll back the feature. Since feature is landed over a year without any problem, remove the flag now. Bug: 171269957 Test: atest TetheringTests Change-Id: I3ef414a47dd0a1f80ea2d378601ccd7c14067318 --- .../tethering/PrivateAddressCoordinator.java | 7 ++--- .../tethering/TetheringConfiguration.java | 20 -------------- .../tethering/mts/TetheringModuleTest.java | 5 ---- .../PrivateAddressCoordinatorTest.java | 1 - .../tethering/TetheringConfigurationTest.java | 27 ------------------- 5 files changed, 2 insertions(+), 58 deletions(-) diff --git a/Tethering/src/com/android/networkstack/tethering/PrivateAddressCoordinator.java b/Tethering/src/com/android/networkstack/tethering/PrivateAddressCoordinator.java index c1e7127b02..cc2422f877 100644 --- a/Tethering/src/com/android/networkstack/tethering/PrivateAddressCoordinator.java +++ b/Tethering/src/com/android/networkstack/tethering/PrivateAddressCoordinator.java @@ -90,11 +90,8 @@ public class PrivateAddressCoordinator { mCachedAddresses.put(TETHERING_BLUETOOTH, new LinkAddress(LEGACY_BLUETOOTH_IFACE_ADDRESS)); mCachedAddresses.put(TETHERING_WIFI_P2P, new LinkAddress(LEGACY_WIFI_P2P_IFACE_ADDRESS)); - mTetheringPrefixes = new ArrayList<>(Arrays.asList(new IpPrefix("192.168.0.0/16"))); - if (config.isSelectAllPrefixRangeEnabled()) { - mTetheringPrefixes.add(new IpPrefix("172.16.0.0/12")); - mTetheringPrefixes.add(new IpPrefix("10.0.0.0/8")); - } + mTetheringPrefixes = new ArrayList<>(Arrays.asList(new IpPrefix("192.168.0.0/16"), + new IpPrefix("172.16.0.0/12"), new IpPrefix("10.0.0.0/8"))); } /** diff --git a/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java b/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java index dd0d5679a1..8488a9a5bf 100644 --- a/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java +++ b/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java @@ -98,13 +98,6 @@ public class TetheringConfiguration { public static final String USE_LEGACY_WIFI_P2P_DEDICATED_IP = "use_legacy_wifi_p2p_dedicated_ip"; - /** - * Flag use to enable select all prefix ranges feature. - * TODO: Remove this flag if there are no problems after M-2020-12 rolls out. - */ - public static final String TETHER_ENABLE_SELECT_ALL_PREFIX_RANGES = - "tether_enable_select_all_prefix_ranges"; - /** * Experiment flag to force choosing upstreams automatically. * @@ -157,7 +150,6 @@ public class TetheringConfiguration { private final boolean mEnableBpfOffload; private final boolean mEnableWifiP2pDedicatedIp; - private final boolean mEnableSelectAllPrefixRange; private final int mUsbTetheringFunction; protected final ContentResolver mContentResolver; @@ -222,11 +214,6 @@ public class TetheringConfiguration { R.bool.config_tether_enable_legacy_wifi_p2p_dedicated_ip, false /* defaultValue */); - // Flags should normally not be booleans, but this is a kill-switch flag that is only used - // to turn off the feature, so binary rollback problems do not apply. - mEnableSelectAllPrefixRange = getDeviceConfigBoolean( - TETHER_ENABLE_SELECT_ALL_PREFIX_RANGES, true /* defaultValue */); - configLog.log(toString()); } @@ -318,9 +305,6 @@ public class TetheringConfiguration { pw.print("enableWifiP2pDedicatedIp: "); pw.println(mEnableWifiP2pDedicatedIp); - pw.print("mEnableSelectAllPrefixRange: "); - pw.println(mEnableSelectAllPrefixRange); - pw.print("mUsbTetheringFunction: "); pw.println(isUsingNcm() ? "NCM" : "RNDIS"); } @@ -384,10 +368,6 @@ public class TetheringConfiguration { return mEnableBpfOffload; } - public boolean isSelectAllPrefixRangeEnabled() { - return mEnableSelectAllPrefixRange; - } - private int getUsbTetheringFunction(Resources res) { final int valueFromRes = getResourceInteger(res, R.integer.config_tether_usb_functions, TETHER_USB_RNDIS_FUNCTION /* defaultValue */); diff --git a/Tethering/tests/mts/src/android/tethering/mts/TetheringModuleTest.java b/Tethering/tests/mts/src/android/tethering/mts/TetheringModuleTest.java index ef254ff7e3..4525568d9a 100644 --- a/Tethering/tests/mts/src/android/tethering/mts/TetheringModuleTest.java +++ b/Tethering/tests/mts/src/android/tethering/mts/TetheringModuleTest.java @@ -29,7 +29,6 @@ import static com.android.testutils.TestNetworkTrackerKt.initTestNetwork; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import static org.junit.Assume.assumeTrue; import android.app.UiAutomation; import android.content.Context; @@ -81,12 +80,8 @@ public class TetheringModuleTest { mUiAutomation.dropShellPermissionIdentity(); } - private static final String TETHER_ENABLE_SELECT_ALL_PREFIX_RANGES = - "tether_enable_select_all_prefix_ranges"; @Test public void testSwitchBasePrefixRangeWhenConflict() throws Exception { - assumeTrue(isFeatureEnabled(TETHER_ENABLE_SELECT_ALL_PREFIX_RANGES, true)); - addressConflictTest(true); } diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java index 6c98f2fdda..55d9852b34 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java @@ -100,7 +100,6 @@ public final class PrivateAddressCoordinatorTest { when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(mConnectivityMgr); when(mConnectivityMgr.getAllNetworks()).thenReturn(mAllNetworks); when(mConfig.shouldEnableWifiP2pDedicatedIp()).thenReturn(false); - when(mConfig.isSelectAllPrefixRangeEnabled()).thenReturn(true); setUpIpServers(); mPrivateAddressCoordinator = spy(new PrivateAddressCoordinator(mContext, mConfig)); } diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java index c0c2ab9a9d..11e19ebc0b 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java @@ -182,7 +182,6 @@ public class TetheringConfigurationTest { when(mResources.getBoolean(R.bool.config_tether_enable_legacy_wifi_p2p_dedicated_ip)) .thenReturn(false); initializeBpfOffloadConfiguration(true, null /* unset */); - initEnableSelectAllPrefixRangeFlag(null /* unset */); mHasTelephonyManager = true; mMockContext = new MockContext(mContext); @@ -490,32 +489,6 @@ public class TetheringConfigurationTest { assertTrue(testCfg.shouldEnableWifiP2pDedicatedIp()); } - private void initEnableSelectAllPrefixRangeFlag(final String value) { - doReturn(value).when( - () -> DeviceConfig.getProperty(eq(NAMESPACE_CONNECTIVITY), - eq(TetheringConfiguration.TETHER_ENABLE_SELECT_ALL_PREFIX_RANGES))); - } - - @Test - public void testSelectAllPrefixRangeFlag() throws Exception { - // Test default value. - final TetheringConfiguration defaultCfg = new TetheringConfiguration( - mMockContext, mLog, INVALID_SUBSCRIPTION_ID); - assertTrue(defaultCfg.isSelectAllPrefixRangeEnabled()); - - // Test disable flag. - initEnableSelectAllPrefixRangeFlag("false"); - final TetheringConfiguration testDisable = new TetheringConfiguration( - mMockContext, mLog, INVALID_SUBSCRIPTION_ID); - assertFalse(testDisable.isSelectAllPrefixRangeEnabled()); - - // Test enable flag. - initEnableSelectAllPrefixRangeFlag("true"); - final TetheringConfiguration testEnable = new TetheringConfiguration( - mMockContext, mLog, INVALID_SUBSCRIPTION_ID); - assertTrue(testEnable.isSelectAllPrefixRangeEnabled()); - } - @Test public void testChooseUpstreamAutomatically() throws Exception { when(mResources.getBoolean(R.bool.config_tether_upstream_automatic))