Merge "Support legacy limit reached callback"
diff --git a/staticlibs/tests/unit/src/com/android/net/module/util/StructTest.java b/staticlibs/tests/unit/src/com/android/net/module/util/StructTest.java
index df74398..eabc14b 100644
--- a/staticlibs/tests/unit/src/com/android/net/module/util/StructTest.java
+++ b/staticlibs/tests/unit/src/com/android/net/module/util/StructTest.java
@@ -31,7 +31,6 @@
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
-import com.android.internal.util.HexDump;
import com.android.net.module.util.Struct.Field;
import com.android.net.module.util.Struct.Type;
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
index 8477151..d034a7d 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
@@ -30,12 +30,7 @@
) : NetworkStatsProvider() {
sealed class CallbackType {
data class OnRequestStatsUpdate(val token: Int) : CallbackType()
- data class OnSetWarningAndLimit(
- 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 quotaBytes: Long) : CallbackType()
data class OnSetAlert(val quotaBytes: Long) : CallbackType()
}
@@ -47,10 +42,6 @@
history.add(CallbackType.OnRequestStatsUpdate(token))
}
- override fun onSetWarningAndLimit(iface: String, warningBytes: Long, limitBytes: Long) {
- history.add(CallbackType.OnSetWarningAndLimit(iface, warningBytes, limitBytes))
- }
-
override fun onSetLimit(iface: String, quotaBytes: Long) {
history.add(CallbackType.OnSetLimit(iface, quotaBytes))
}
@@ -65,7 +56,7 @@
if (token != TOKEN_ANY) {
assertEquals(token, event.token)
}
- return event.token
+ return token
}
fun expectOnSetLimit(iface: String?, quotaBytes: Long, timeout: Long = defaultTimeoutMs) {