Merge "Filter buckets with zero usage" into main

src/com/android/settings/datausage/lib/NetworkStatsRepository.kt

@@ -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(
+                if (bucket.bytes > 0) {
-                    uid = bucket.uid,
+                    buckets += Bucket(
-                    bytes = bucket.bytes,
+                        uid = bucket.uid,
-                    state = bucket.state,
+                        bytes = bucket.bytes,
-                    startTimeStamp = bucket.startTimeStamp,
+                        state = bucket.state,
-                    endTimeStamp = bucket.endTimeStamp,
+                        startTimeStamp = bucket.startTimeStamp,
-                )
+                        endTimeStamp = bucket.endTimeStamp,
+                    )
+                }
             }
             buckets
         }

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

@@ -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