Merge changes I325b13d5,I89719fe7 am: 31cb4583e5 am: d1800f3e6f

am: 4fa0187015 Change-Id: Ib980879b0e50ffe1c8209339df22da4a50d5b74e
2017-08-19 03:38:10 +00:00
parent aa32c400ce d1800f3e6f
commit 4187540d39
2 changed files with 17 additions and 5 deletions
--- a/core/java/android/net/NetworkStats.java
+++ b/core/java/android/net/NetworkStats.java
@@ -82,6 +82,11 @@ public class NetworkStats implements Parcelable {
    /** {@link #roaming} value where roaming data is accounted. */
    public static final int ROAMING_YES = 1;

+    /** Denotes a request for stats at the interface level. */
+    public static final int STATS_PER_IFACE = 0;
+    /** Denotes a request for stats at the interface and UID level. */
+    public static final int STATS_PER_UID = 1;
+
    // TODO: move fields to "mVariable" notation

    /**