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 "Make a defensive copy when sending NetworkInfo change"

Browse source
This commit is contained in:
Treehugger Robot 2022-04-28 09:29:27 +00:00 • committed by Gerrit Code Review
commit 8eda07cff7
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
framework/src/android/net/NetworkAgent.java
View file

@ -1076,11 +1076,12 @@ public abstract class NetworkAgent {
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
public final void sendNetworkInfo(NetworkInfo networkInfo) {
queueOrSendNetworkInfo(new NetworkInfo(networkInfo));
queueOrSendNetworkInfo(networkInfo);
}
private void queueOrSendNetworkInfo(NetworkInfo networkInfo) {
queueOrSendMessage(reg -> reg.sendNetworkInfo(networkInfo));
final NetworkInfo ni = new NetworkInfo(networkInfo);
queueOrSendMessage(reg -> reg.sendNetworkInfo(ni));
}
/**

19
tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
View file

@ -1275,4 +1275,23 @@ class NetworkAgentTest {
matchAllCallback.expectCallback<Lost>(wifiNetwork)
wifiAgent.expectCallback<OnNetworkUnwanted>()
}
@Test
fun testUnregisterAgentBeforeAgentFullyConnected() {
val specifier = UUID.randomUUID().toString()
val callback = TestableNetworkCallback()
val transports = intArrayOf(TRANSPORT_CELLULAR)
// Ensure this NetworkAgent is never unneeded by filing a request with its specifier.
requestNetwork(makeTestNetworkRequest(specifier = specifier), callback)
val nc = makeTestNetworkCapabilities(specifier, transports)
val agent = createNetworkAgent(realContext, initialNc = nc)
// Connect the agent
agent.register()
// Mark agent connected then unregister agent immediately. Verify that both available and
// lost callback should be sent still.
agent.markConnected()
agent.unregister()
callback.expectCallback<Available>(agent.network!!)
callback.eventuallyExpect<Lost> { it.network == agent.network }
}
}