Merge "Last-ditch clamping of negative NetworkStats." into pi-dev am: 0026f5eb18

am: eecce38819 Change-Id: I572ef538dafb59d8947958df8eac155e890d08f0
2018-05-23 17:43:05 -07:00
parent 5f2e77cd42 eecce38819
commit d811e74b93
3 changed files with 32 additions and 4 deletions
--- a/core/java/android/net/NetworkStats.java
+++ b/core/java/android/net/NetworkStats.java
@@ -1100,6 +1100,8 @@ public class NetworkStats implements Parcelable {
    public interface NonMonotonicObserver<C> {
        public void foundNonMonotonic(
                NetworkStats left, int leftIndex, NetworkStats right, int rightIndex, C cookie);
+        public void foundNonMonotonic(
+                NetworkStats stats, int statsIndex, C cookie);
    }

    /**