joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add experiment flag for enabling sync sm" into main

Browse source
This commit is contained in:
Mark Chien 2024-01-30 02:18:24 +00:00 • committed by Gerrit Code Review
commit c1647a0efc
3 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Tethering/src/com/android/networkstack/tethering/Tethering.java
View file

@ -368,6 +368,7 @@ public class Tethering {
// Load tethering configuration.
updateConfiguration();
mConfig.readEnableSyncSM(mContext);
// It is OK for the configuration to be passed to the PrivateAddressCoordinator at
// construction time because the only part of the configuration it uses is
// shouldEnableWifiP2pDedicatedIp(), and currently do not support changing that.

18
Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java
View file

@ -132,6 +132,9 @@ public class TetheringConfiguration {
public static final String TETHER_FORCE_RANDOM_PREFIX_BASE_SELECTION =
"tether_force_random_prefix_base_selection";
public static final String TETHER_ENABLE_SYNC_SM = "tether_enable_sync_sm";
/**
* Default value that used to periodic polls tether offload stats from tethering offload HAL
* to make the data warnings work.
@ -139,7 +142,7 @@ public class TetheringConfiguration {
public static final int DEFAULT_TETHER_OFFLOAD_POLL_INTERVAL_MS = 5000;
/** A flag for using synchronous or asynchronous state machine. */
public static final boolean USE_SYNC_SM = false;
public static boolean USE_SYNC_SM = false;
public final String[] tetherableUsbRegexs;
public final String[] tetherableWifiRegexs;
@ -385,6 +388,16 @@ public class TetheringConfiguration {
return mRandomPrefixBase;
}
/**
* Check whether sync SM is enabled then set it to USE_SYNC_SM. This should be called once
* when tethering is created. Otherwise if the flag is pushed while tethering is enabled,
* then it's possible for some IpServer(s) running the new sync state machine while others
* use the async state machine.
*/
public void readEnableSyncSM(final Context ctx) {
USE_SYNC_SM = mDeps.isFeatureEnabled(ctx, TETHER_ENABLE_SYNC_SM);
}
/** Does the dumping.*/
public void dump(PrintWriter pw) {
pw.print("activeDataSubId: ");
@ -438,6 +451,9 @@ public class TetheringConfiguration {
pw.print("mRandomPrefixBase: ");
pw.println(mRandomPrefixBase);
pw.print("USE_SYNC_SM: ");
pw.println(USE_SYNC_SM);
}
/** Returns the string representation of this object.*/

23
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java
View file

@ -754,4 +754,27 @@ public class TetheringConfigurationTest {
new TetheringConfiguration(mMockContext, mLog, INVALID_SUBSCRIPTION_ID, mDeps);
assertEquals(p2pLeasesSubnetPrefixLength, p2pCfg.getP2pLeasesSubnetPrefixLength());
}
private void setTetherEnableSyncSMFlagEnabled(Boolean enabled) {
mDeps.setFeatureEnabled(TetheringConfiguration.TETHER_ENABLE_SYNC_SM, enabled);
new TetheringConfiguration(
mMockContext, mLog, INVALID_SUBSCRIPTION_ID, mDeps).readEnableSyncSM(mMockContext);
}
private void assertEnableSyncSM(boolean value) {
assertEquals(value, TetheringConfiguration.USE_SYNC_SM);
}
@Test
public void testEnableSyncSMFlag() throws Exception {
// Test default disabled
setTetherEnableSyncSMFlagEnabled(null);
assertEnableSyncSM(false);
setTetherEnableSyncSMFlagEnabled(true);
assertEnableSyncSM(true);
setTetherEnableSyncSMFlagEnabled(false);
assertEnableSyncSM(false);
}
}