Merge "[SP25] Rename functions that add Entry conditionally" am: 52ee59fb03

Change-Id: I7e0698f0e60d4c26864ceb728b74a265351a8506
This commit is contained in:
Junyu Lai
2020-03-18 03:45:41 +00:00
committed by Automerger Merge Worker

View File

@@ -1034,10 +1034,10 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
// 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);
final NetworkStats expectedStats = new NetworkStats(0L, 1) final NetworkStats expectedStats = new NetworkStats(0L, 1)
.addValues(new NetworkStats.Entry(TEST_IFACE, UID_RED, SET_DEFAULT, .addEntry(new NetworkStats.Entry(TEST_IFACE, UID_RED, SET_DEFAULT,
TAG_NONE, METERED_YES, ROAMING_NO, DEFAULT_NETWORK_YES, TAG_NONE, METERED_YES, ROAMING_NO, DEFAULT_NETWORK_YES,
128L, 2L, 128L, 2L, 1L)) 128L, 2L, 128L, 2L, 1L))
.addValues(new NetworkStats.Entry(TEST_IFACE, UID_RED, SET_DEFAULT, .addEntry(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.notifyStatsUpdated(0 /* unused */, expectedStats, expectedStats); cb.notifyStatsUpdated(0 /* unused */, expectedStats, expectedStats);