Add a NetworkAgent API to indicate that a network will be replaced.

This is useful for link layers that disconnect but know they will
reconnect to a similar network soon, and do not want the device
to switch to another network until the reconnect happens. An
example is wifi switching to another network that is on a
different subnet without the device switching to cellular data.

This works by immediately destroying the network, so the link
layer can reuse the same interface name for the new network. It
would be possible to delay destroying the network until the new
network connects, but in practice this does not seem useful,
because the if the link layer reuses the interface, then the
interface will be undergoing reconfiguration, and will likely
not be usable for app traffic.

This CL also moves the call to onNetworkDestroyed into
destroyNativeNetwork. This is needed to ensure that the new
API calls onNetworkDestroyed even though most teardown
operations have not happened. This causes onNetworkDestroyed to
happen before the netId is marked free, but that shouldn't cause
any behavioural changes because netId allocation is an
implementation detail of ConnectivityService and is not
observable by apps or system components.

Bug: 216567577
Test: builds, boots
Test: atest FrameworksNetTests FrameworksNetIntegrationTests
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest#testDestroyAndAwaitReplacement
Change-Id: I9f9e022fef66b31a29cce560413321075e992756
This commit is contained in:
Lorenzo Colitti
2022-02-16 14:59:00 +09:00
parent 3938102448
commit ffa2ed3d1c
7 changed files with 329 additions and 28 deletions

View File

@@ -47,4 +47,5 @@ oneway interface INetworkAgentRegistry {
void sendAddDscpPolicy(in DscpPolicy policy);
void sendRemoveDscpPolicy(int policyId);
void sendRemoveAllDscpPolicies();
void sendDestroyAndAwaitReplacement(int timeoutMillis);
}

View File

@@ -434,6 +434,14 @@ public abstract class NetworkAgent {
*/
public static final int CMD_DSCP_POLICY_STATUS = BASE + 28;
/**
* Sent by the NetworkAgent to ConnectivityService to notify that this network is expected to be
* replaced within the specified time by a similar network.
* arg1 = timeout in milliseconds
* @hide
*/
public static final int EVENT_DESTROY_AND_AWAIT_REPLACEMENT = BASE + 29;
private static NetworkInfo getLegacyNetworkInfo(final NetworkAgentConfig config) {
final NetworkInfo ni = new NetworkInfo(config.legacyType, config.legacySubType,
config.legacyTypeName, config.legacySubTypeName);
@@ -942,6 +950,45 @@ public abstract class NetworkAgent {
queueOrSendMessage(reg -> reg.sendTeardownDelayMs(teardownDelayMillis));
}
/**
* Indicates that this agent will likely soon be replaced by another agent for a very similar
* network (e.g., same Wi-Fi SSID).
*
* If the network is not currently satisfying any {@link NetworkRequest}s, it will be torn down.
* If it is satisfying requests, then the native network corresponding to the agent will be
* destroyed immediately, but the agent will remain registered and will continue to satisfy
* requests until {@link #unregister} is called, the network is replaced by an equivalent or
* better network, or the specified timeout expires. During this time:
*
* <ul>
* <li>The agent may not send any further updates, for example by calling methods
* such as {@link #sendNetworkCapabilities}, {@link #sendLinkProperties},
* {@link #sendNetworkScore(NetworkScore)} and so on. Any such updates will be ignored.
* <li>The network will remain connected and continue to satisfy any requests that it would
* otherwise satisfy (including, possibly, the default request).
* <li>The validation state of the network will not change, and calls to
* {@link ConnectivityManager#reportNetworkConnectivity(Network, boolean)} will be ignored.
* </ul>
*
* Once this method is called, it is not possible to restore the agent to a functioning state.
* If a replacement network becomes available, then a new agent must be registered. When that
* replacement network is fully capable of replacing this network (including, possibly, being
* validated), this agent will no longer be needed and will be torn down. Otherwise, this agent
* can be disconnected by calling {@link #unregister}. If {@link #unregister} is not called,
* this agent will automatically be unregistered when the specified timeout expires. Any
* teardown delay previously set using{@link #setTeardownDelayMillis} is ignored.
*
* <p>This method has no effect if {@link #markConnected} has not yet been called.
* <p>This method may only be called once.
*
* @param timeoutMillis the timeout after which this network will be unregistered even if
* {@link #unregister} was not called.
*/
public void destroyAndAwaitReplacement(
@IntRange(from = 0, to = MAX_TEARDOWN_DELAY_MS) int timeoutMillis) {
queueOrSendMessage(reg -> reg.sendDestroyAndAwaitReplacement(timeoutMillis));
}
/**
* Change the legacy subtype of this network agent.
*