Merge changes from topic "unwanted" into pi-dev

am: 2eae1e3a45

Change-Id: Ib6f46ff91a6d774a516fa299284d9d552081dde6
This commit is contained in:
Lorenzo Colitti
2018-04-06 20:01:23 -07:00
committed by android-build-merger

View File

@@ -305,6 +305,8 @@ public class NetworkStatsManager {
* {@link java.lang.System#currentTimeMillis}. * {@link java.lang.System#currentTimeMillis}.
* @param uid UID of app * @param uid UID of app
* @param tag TAG of interest. Use {@link NetworkStats.Bucket#TAG_NONE} for no tags. * @param tag TAG of interest. Use {@link NetworkStats.Bucket#TAG_NONE} for no tags.
* @param state state of interest. Use {@link NetworkStats.Bucket#STATE_ALL} to aggregate
* traffic from all states.
* @return Statistics object or null if an error happened during statistics collection. * @return Statistics object or null if an error happened during statistics collection.
* @throws SecurityException if permissions are insufficient to read network statistics. * @throws SecurityException if permissions are insufficient to read network statistics.
*/ */