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

Merge "Remove dev recorder from NetworkStatsService"

Browse Source
This commit is contained in:
Aaron Huang
2023-01-17 07:27:35 +00:00
committed by Gerrit Code Review
parent 6366d7c2db 2e18f3ed8f
commit a3ed25924e
3 changed files with 35 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
View File

@@ -2198,7 +2198,7 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
private NetworkStatsCollection getLegacyCollection(String prefix, boolean includeTags) {
final NetworkStatsRecorder recorder = makeTestRecorder(mLegacyStatsDir, prefix,
mSettings.getDevConfig(), includeTags, false);
mSettings.getXtConfig(), includeTags, false);
return recorder.getOrLoadCompleteLocked();
}
@@ -2255,14 +2255,9 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
}
private void mockNetworkStatsSummary(NetworkStats summary) throws Exception {
mockNetworkStatsSummaryDev(summary.clone());
mockNetworkStatsSummaryXt(summary.clone());
}
private void mockNetworkStatsSummaryDev(NetworkStats summary) throws Exception {
doReturn(summary).when(mStatsFactory).readNetworkStatsSummaryDev();
}
private void mockNetworkStatsSummaryXt(NetworkStats summary) throws Exception {
doReturn(summary).when(mStatsFactory).readNetworkStatsSummaryXt();
}
@@ -2293,13 +2288,11 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
doReturn(false).when(mSettings).getCombineSubtypeEnabled();
final Config config = new Config(bucketDuration, deleteAge, deleteAge);
doReturn(config).when(mSettings).getDevConfig();
doReturn(config).when(mSettings).getXtConfig();
doReturn(config).when(mSettings).getUidConfig();
doReturn(config).when(mSettings).getUidTagConfig();
doReturn(MB_IN_BYTES).when(mSettings).getGlobalAlertBytes(anyLong());
doReturn(MB_IN_BYTES).when(mSettings).getDevPersistBytes(anyLong());
doReturn(MB_IN_BYTES).when(mSettings).getXtPersistBytes(anyLong());
doReturn(MB_IN_BYTES).when(mSettings).getUidPersistBytes(anyLong());
doReturn(MB_IN_BYTES).when(mSettings).getUidTagPersistBytes(anyLong());