LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove tether_enable_select_all_prefix_ranges flag"

Browse Source
This commit is contained in:
Mark Chien
2022-03-03 09:40:27 +00:00
committed by Gerrit Code Review
parent 481c0cd100 23a5f18adb
commit a3728e97ca
5 changed files with 2 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Tethering/src/com/android/networkstack/tethering/PrivateAddressCoordinator.java
View File

@@ -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")));
}
/**

20
Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java
View File

@@ -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 */);

5
Tethering/tests/mts/src/android/tethering/mts/TetheringModuleTest.java
View File

@@ -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);
}

1
Tethering/tests/unit/src/com/android/networkstack/tethering/PrivateAddressCoordinatorTest.java
View File

@@ -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));
}

27
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java
View File

@@ -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))