Merge changes from topic "testStatsProvider-cp" am: 8dc319b30f
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1843374
Change-Id: Ifd7c922d474aa701e53bd2393495a4cfaef7ecb6
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
index 8477151..be5c9b2 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
@@ -31,11 +31,15 @@
sealed class CallbackType {
data class OnRequestStatsUpdate(val token: Int) : CallbackType()
data class OnSetWarningAndLimit(
- val iface: String?,
+ val iface: String,
val warningBytes: Long,
val limitBytes: Long
) : CallbackType()
- data class OnSetLimit(val iface: String?, val limitBytes: Long) : CallbackType()
+ data class OnSetLimit(val iface: String, val limitBytes: Long) : CallbackType() {
+ // Add getter for backward compatibility since old tests do not recognize limitBytes.
+ val quotaBytes: Long
+ get() = limitBytes
+ }
data class OnSetAlert(val quotaBytes: Long) : CallbackType()
}
@@ -68,7 +72,7 @@
return event.token
}
- fun expectOnSetLimit(iface: String?, quotaBytes: Long, timeout: Long = defaultTimeoutMs) {
+ fun expectOnSetLimit(iface: String, quotaBytes: Long, timeout: Long = defaultTimeoutMs) {
assertEquals(CallbackType.OnSetLimit(iface, quotaBytes), history.poll(timeout))
}