Support legacy limit reached callback
Add a callback entry for the older notifyLimitReached callback, that is
used on R devices.
Bug: 182962001
Test: atest OffloadControllerTest
Change-Id: Ic3c40eeb72b58ff1514f35be8e030a1dd9ba95d7
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt
index f15f610..c039cad 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt
@@ -32,6 +32,7 @@
val uidStats: NetworkStats
) : CallbackType()
object NotifyWarningOrLimitReached : CallbackType()
+ object LegacyNotifyLimitReached : CallbackType()
object NotifyAlertReached : CallbackType()
object Unregister : CallbackType()
}
@@ -46,6 +47,11 @@
history.add(CallbackType.NotifyWarningOrLimitReached)
}
+ override fun notifyLimitReached() {
+ // Older callback renamed to notifyWarningOrLimitReached in S
+ history.add(CallbackType.LegacyNotifyLimitReached)
+ }
+
override fun notifyAlertReached() {
history.add(CallbackType.NotifyAlertReached)
}
@@ -72,6 +78,9 @@
fun expectNotifyWarningOrLimitReached() =
assertEquals(CallbackType.NotifyWarningOrLimitReached, history.poll(DEFAULT_TIMEOUT_MS))
+ fun expectLegacyNotifyLimitReached() =
+ assertEquals(CallbackType.LegacyNotifyLimitReached, history.poll(DEFAULT_TIMEOUT_MS))
+
fun expectNotifyAlertReached() =
assertEquals(CallbackType.NotifyAlertReached, history.poll(DEFAULT_TIMEOUT_MS))