PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Filter buckets with zero usage" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-04-02 03:25:44 +00:00
committed by Android (Google) Code Review
parent 0ae12e27ac c24af35654
commit b3426fe88b
2 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/datausage/lib/NetworkStatsRepository.kt
View File

@@ -93,13 +93,15 @@ class NetworkStatsRepository(context: Context, private val template: NetworkTemp
val buckets = mutableListOf<Bucket>()
val bucket = NetworkStats.Bucket()
while (getNextBucket(bucket)) {
buckets += Bucket(
uid = bucket.uid,
bytes = bucket.bytes,
state = bucket.state,
startTimeStamp = bucket.startTimeStamp,
endTimeStamp = bucket.endTimeStamp,
)
if (bucket.bytes > 0) {
buckets += Bucket(
uid = bucket.uid,
bytes = bucket.bytes,
state = bucket.state,
startTimeStamp = bucket.startTimeStamp,
endTimeStamp = bucket.endTimeStamp,
)
}
}
buckets
}

26
tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageDetailsRepositoryTest.kt
View File

@@ -125,6 +125,32 @@ class AppDataUsageDetailsRepositoryTest {
)
}
@Test
fun queryDetailsForCycles_appWithZeroUsage_filtered(): Unit = runBlocking {
networkStatsRepository.stub {
on { queryBuckets(CYCLE1_END_TIME, CYCLE2_END_TIME) } doReturn listOf(
Bucket(
uid = UID,
bytes = 0L,
startTimeStamp = 0L,
endTimeStamp = 0L,
),
)
}
val repository = AppDataUsageDetailsRepository(
context = context,
cycles = null,
template = template,
uids = listOf(UID),
networkCycleDataRepository = networkCycleDataRepository,
networkStatsRepository = networkStatsRepository,
)
val detailsForCycles = repository.queryDetailsForCycles()
assertThat(detailsForCycles).isEmpty()
}
private companion object {
const val CYCLE1_START_TIME = 1694444444000L
const val CYCLE1_END_TIME = 1695555555000L