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

[SP21] Address comments for API council review about aosp/1172143

Browse Source 
Test: atest FrameworksNetTests ImsPhoneCallTrackerTest
Test: atest TetheringTests NetworkStackTests
Test: m doc-comment-check-docs
Fix: 148552904

Change-Id: I141393f229e772d2eb9f7c156849e379bd71b845
Merged-In: I141393f229e772d2eb9f7c156849e379bd71b845
(cherry picked from aosp/1253717)
This commit is contained in:
junyulai
2020-03-06 14:50:48 +08:00
committed by Junyu Lai
parent 6bf269b1b5
commit 268e185cae
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
View File

@@ -1026,7 +1026,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]); mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);
// Verifies that one requestStatsUpdate will be called during iface update. // Verifies that one requestStatsUpdate will be called during iface update.
provider.expectStatsUpdate(0 /* unused */); provider.expectOnRequestStatsUpdate(0 /* unused */);
// Create some initial traffic and report to the service. // Create some initial traffic and report to the service.
incrementCurrentTime(HOUR_IN_MILLIS); incrementCurrentTime(HOUR_IN_MILLIS);
@@ -1037,7 +1037,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
.addValues(new NetworkStats.Entry(TEST_IFACE, UID_RED, SET_DEFAULT, .addValues(new NetworkStats.Entry(TEST_IFACE, UID_RED, SET_DEFAULT,
0xF00D, METERED_YES, ROAMING_NO, DEFAULT_NETWORK_YES, 0xF00D, METERED_YES, ROAMING_NO, DEFAULT_NETWORK_YES,
64L, 1L, 64L, 1L, 1L)); 64L, 1L, 64L, 1L, 1L));
cb.onStatsUpdated(0 /* unused */, expectedStats, expectedStats); cb.notifyStatsUpdated(0 /* unused */, expectedStats, expectedStats);
// Make another empty mutable stats object. This is necessary since the new NetworkStats // Make another empty mutable stats object. This is necessary since the new NetworkStats
// object will be used to compare with the old one in NetworkStatsRecoder, two of them // object will be used to compare with the old one in NetworkStatsRecoder, two of them
@@ -1047,8 +1047,8 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
forcePollAndWaitForIdle(); forcePollAndWaitForIdle();
// Verifies that one requestStatsUpdate and setAlert will be called during polling. // Verifies that one requestStatsUpdate and setAlert will be called during polling.
provider.expectStatsUpdate(0 /* unused */); provider.expectOnRequestStatsUpdate(0 /* unused */);
provider.expectSetAlert(MB_IN_BYTES); provider.expectOnSetAlert(MB_IN_BYTES);
// Verifies that service recorded history, does not verify uid tag part. // Verifies that service recorded history, does not verify uid tag part.
assertUidTotal(sTemplateWifi, UID_RED, 128L, 2L, 128L, 2L, 1); assertUidTotal(sTemplateWifi, UID_RED, 128L, 2L, 128L, 2L, 1);
@@ -1082,13 +1082,13 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
assertNotNull(cb); assertNotNull(cb);
// Simulates alert quota of the provider has been reached. // Simulates alert quota of the provider has been reached.
cb.onAlertReached(); cb.notifyAlertReached();
HandlerUtilsKt.waitForIdle(mHandlerThread, WAIT_TIMEOUT); HandlerUtilsKt.waitForIdle(mHandlerThread, WAIT_TIMEOUT);
// Verifies that polling is triggered by alert reached. // Verifies that polling is triggered by alert reached.
provider.expectStatsUpdate(0 /* unused */); provider.expectOnRequestStatsUpdate(0 /* unused */);
// Verifies that global alert will be re-armed. // Verifies that global alert will be re-armed.
provider.expectSetAlert(MB_IN_BYTES); provider.expectOnSetAlert(MB_IN_BYTES);
} }
private static File getBaseDir(File statsDir) { private static File getBaseDir(File statsDir) {