diff options
author | Junyu Lai <junyulai@google.com> | 2021-06-23 20:41:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-23 20:41:01 +0000 |
commit | 01358583913748fcfede4f178c3f613bc7de3166 (patch) | |
tree | 4f67cd5d4bc05decfd6c85f4dce1813990e366dd | |
parent | 7a6e319e8fe4c2e6c23ca781f263b396b1862a98 (diff) | |
parent | 1db2e1600bd9fbaec6e56627efb4ecb77814627d (diff) | |
download | net-01358583913748fcfede4f178c3f613bc7de3166.tar.gz |
Merge "Add OnSetWarningAndLimit into TestableNetworkStatsProvider" into sc-dev am: 1db2e1600b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/15061296
Change-Id: I95cd53b7f3912f67b67dca0e0a27e79165858be8
-rw-r--r-- | common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt b/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt index d034a7d5..8477151b 100644 --- a/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt +++ b/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt @@ -30,7 +30,12 @@ open class TestableNetworkStatsProvider( ) : NetworkStatsProvider() { sealed class CallbackType { data class OnRequestStatsUpdate(val token: Int) : CallbackType() - data class OnSetLimit(val iface: String?, val quotaBytes: Long) : 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 OnSetAlert(val quotaBytes: Long) : CallbackType() } @@ -42,6 +47,10 @@ open class TestableNetworkStatsProvider( 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)) } @@ -56,7 +65,7 @@ open class TestableNetworkStatsProvider( if (token != TOKEN_ANY) { assertEquals(token, event.token) } - return token + return event.token } fun expectOnSetLimit(iface: String?, quotaBytes: Long, timeout: Long = defaultTimeoutMs) { |