commit | 93765193d36f93fc644f4a58b3999aed444c40eb | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 22 11:31:45 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 22 11:31:45 2022 +0000 |
tree | c7360978604c8bcb46d5e1e58345f6fe309ff729 | |
parent | f105588f91f01e3db07e3db286cc4a8d20ef6ff5 [diff] | |
parent | d6a5303cd8f1594d9612ecf0cb5f1c68925b11b8 [diff] |
Merge changes Ie68356a4,I2b63c24b am: d6a5303cd8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1993952 Change-Id: Id3cb1919302d5c232ac9ec4149eca9c3a6821c70
diff --git a/service/src/com/android/server/connectivity/NetworkAgentInfo.java b/service/src/com/android/server/connectivity/NetworkAgentInfo.java index 1bdf50a..e29d616 100644 --- a/service/src/com/android/server/connectivity/NetworkAgentInfo.java +++ b/service/src/com/android/server/connectivity/NetworkAgentInfo.java
@@ -883,7 +883,7 @@ /** * Returns the number of requests currently satisfied by this network of type - * {@link android.net.NetworkRequest.Type.BACKGROUND_REQUEST}. + * {@link android.net.NetworkRequest.Type#BACKGROUND_REQUEST}. */ public int numBackgroundNetworkRequests() { return mNumBackgroundNetworkRequests; @@ -1028,7 +1028,7 @@ * when a network is newly created. * * @param requestId The requestId of the request that no longer need to be served by this - * network. Or {@link NetworkRequest.REQUEST_ID_NONE} if this is the + * network. Or {@link NetworkRequest#REQUEST_ID_NONE} if this is the * {@code InactivityTimer} for a newly created network. */ // TODO: Consider creating a dedicated function for nascent network, e.g. start/stopNascent.
diff --git a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt index 810d1c6..225602f 100644 --- a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt +++ b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
@@ -472,7 +472,7 @@ @Test fun testRejectedUpdates() { - val callback = TestableNetworkCallback() + val callback = TestableNetworkCallback(DEFAULT_TIMEOUT_MS) // will be cleaned up in tearDown registerNetworkCallback(makeTestNetworkRequest(), callback) val agent = createNetworkAgent(initialNc = ncWithAccessUids(200))