Snap for 8312053 from d56f554481d0d484fbc6faa285a5dc898d3b14e3 to mainline-tethering-releaseandroid-mainline-12.0.0_r110

Change-Id: I2b1c0e3ec30b7213c5193f2371120337a79b953a

2 files changed, 21 insertions, 10 deletions

diff --git a/common/testutils/devicetests/com/android/testutils/NetworkStatsProviderCbStubCompat.java b/common/testutils/devicetests/com/android/testutils/NetworkStatsProviderCbStubCompat.java
index e84a224f..642da7ac 100644
--- a/common/testutils/devicetests/com/android/testutils/NetworkStatsProviderCbStubCompat.java
+++ b/common/testutils/devicetests/com/android/testutils/NetworkStatsProviderCbStubCompat.java
@@ -32,10 +32,13 @@ public class NetworkStatsProviderCbStubCompat extends INetworkStatsProviderCallb
     @Override
     public void notifyAlertReached() throws RemoteException {}
 
-    // Removed in S.
+    /** Added in T. */
     public void notifyLimitReached() throws RemoteException {}
 
-    // Added in S.
+    /** Added in T. */
+    public void notifyWarningReached() throws RemoteException {}
+
+    /** Added in S, removed in T. */
     public void notifyWarningOrLimitReached() throws RemoteException {}
 
     @Override
diff --git a/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt b/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt
index c039cad1..5547c90a 100644
--- a/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt
+++ b/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt
@@ -31,8 +31,9 @@ open class TestableNetworkStatsProviderCbBinder : NetworkStatsProviderCbStubComp
             val ifaceStats: NetworkStats,
             val uidStats: NetworkStats
         ) : CallbackType()
+        object NotifyWarningReached : CallbackType()
+        object NotifyLimitReached : CallbackType()
         object NotifyWarningOrLimitReached : CallbackType()
-        object LegacyNotifyLimitReached : CallbackType()
         object NotifyAlertReached : CallbackType()
         object Unregister : CallbackType()
     }
@@ -43,13 +44,17 @@ open class TestableNetworkStatsProviderCbBinder : NetworkStatsProviderCbStubComp
         history.add(CallbackType.NotifyStatsUpdated(token, ifaceStats, uidStats))
     }
 
-    override fun notifyWarningOrLimitReached() {
-        history.add(CallbackType.NotifyWarningOrLimitReached)
+    override fun notifyWarningReached() {
+        history.add(CallbackType.NotifyWarningReached)
     }
 
     override fun notifyLimitReached() {
-        // Older callback renamed to notifyWarningOrLimitReached in S
-        history.add(CallbackType.LegacyNotifyLimitReached)
+        history.add(CallbackType.NotifyLimitReached)
+    }
+
+    override fun notifyWarningOrLimitReached() {
+        // Older callback is split into notifyLimitReached and notifyWarningReached in T.
+        history.add(CallbackType.NotifyWarningOrLimitReached)
     }
 
     override fun notifyAlertReached() {
@@ -75,12 +80,15 @@ open class TestableNetworkStatsProviderCbBinder : NetworkStatsProviderCbStubComp
         assertNetworkStatsEquals(uidStats, event.uidStats)
     }
 
+    fun expectNotifyWarningReached() =
+            assertEquals(CallbackType.NotifyWarningReached, history.poll(DEFAULT_TIMEOUT_MS))
+
+    fun expectNotifyLimitReached() =
+            assertEquals(CallbackType.NotifyLimitReached, history.poll(DEFAULT_TIMEOUT_MS))
+
     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))