Merge "Allow applications to query for foreground/background data usage." into pi-dev (3cafea07) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -7418,8 +7418,9 @@ package android.app.usage {

		public class NetworkStatsManager {
		method public android.app.usage.NetworkStats queryDetails(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
		method public android.app.usage.NetworkStats queryDetailsForUid(int, java.lang.String, long, long, int) throws android.os.RemoteException, java.lang.SecurityException;
		method public android.app.usage.NetworkStats queryDetailsForUid(int, java.lang.String, long, long, int) throws java.lang.SecurityException;
		method public android.app.usage.NetworkStats queryDetailsForUidTag(int, java.lang.String, long, long, int, int) throws java.lang.SecurityException;
		method public android.app.usage.NetworkStats queryDetailsForUidTagState(int, java.lang.String, long, long, int, int, int) throws java.lang.SecurityException;
		method public android.app.usage.NetworkStats querySummary(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
		method public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
		method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException;

core/java/android/app/usage/NetworkStats.java

+22 −13

Original line number	Diff line number	Diff line
		@@ -67,6 +67,11 @@ public final class NetworkStats implements AutoCloseable {
		*/
		private int mTag = android.net.NetworkStats.TAG_NONE;

		/**
		* State in case it was not specified in the query.
		*/
		private int mState = Bucket.STATE_ALL;

		/**
		* The session while the query requires it, null if all the stats have been collected or close()
		* has been called.
		@@ -267,6 +272,15 @@ public final class NetworkStats implements AutoCloseable {
		private long mTxBytes;
		private long mTxPackets;

		private static int convertSet(@State int state) {
		switch (state) {
		case STATE_ALL: return android.net.NetworkStats.SET_ALL;
		case STATE_DEFAULT: return android.net.NetworkStats.SET_DEFAULT;
		case STATE_FOREGROUND: return android.net.NetworkStats.SET_FOREGROUND;
		}
		return 0;
		}

		private static @State int convertState(int networkStatsSet) {
		switch (networkStatsSet) {
		case android.net.NetworkStats.SET_ALL : return STATE_ALL;
		@@ -527,20 +541,13 @@ public final class NetworkStats implements AutoCloseable {
		/**
		* Collects history results for uid and resets history enumeration index.
		*/
		void startHistoryEnumeration(int uid) {
		startHistoryEnumeration(uid, android.net.NetworkStats.TAG_NONE);
		}

		/**
		* Collects history results for uid and resets history enumeration index.
		*/
		void startHistoryEnumeration(int uid, int tag) {
		void startHistoryEnumeration(int uid, int tag, int state) {
		mHistory = null;
		try {
		mHistory = mSession.getHistoryIntervalForUid(mTemplate, uid,
		android.net.NetworkStats.SET_ALL, tag,
		NetworkStatsHistory.FIELD_ALL, mStartTimeStamp, mEndTimeStamp);
		setSingleUidTag(uid, tag);
		Bucket.convertSet(state), tag, NetworkStatsHistory.FIELD_ALL,
		mStartTimeStamp, mEndTimeStamp);
		setSingleUidTagState(uid, tag, state);
		} catch (RemoteException e) {
		Log.w(TAG, e);
		// Leaving mHistory null
		@@ -636,6 +643,7 @@ public final class NetworkStats implements AutoCloseable {
		fillBucketFromSummaryEntry(bucket);
		return bucket;
		}

		/**
		* Getting the next item in a history enumeration.
		* @param bucketOut Next item will be set here.
		@@ -648,7 +656,7 @@ public final class NetworkStats implements AutoCloseable {
		mRecycledHistoryEntry);
		bucketOut.mUid = Bucket.convertUid(getUid());
		bucketOut.mTag = Bucket.convertTag(mTag);
		bucketOut.mState = Bucket.STATE_ALL;
		bucketOut.mState = mState;
		bucketOut.mDefaultNetwork = Bucket.DEFAULT_NETWORK_ALL;
		bucketOut.mMetered = Bucket.METERED_ALL;
		bucketOut.mRoaming = Bucket.ROAMING_ALL;
		@@ -691,9 +699,10 @@ public final class NetworkStats implements AutoCloseable {
		return mUidOrUidIndex;
		}

		private void setSingleUidTag(int uid, int tag) {
		private void setSingleUidTagState(int uid, int tag, int state) {
		mUidOrUidIndex = uid;
		mTag = tag;
		mState = state;
		}

		private void stepUid() {

core/java/android/app/usage/NetworkStatsManager.java

+25 −13

Original line number	Diff line number	Diff line
		@@ -263,20 +263,31 @@ public class NetworkStatsManager {
		/**
		* Query network usage statistics details for a given uid.
		*
		* #see queryDetailsForUidTag(int, String, long, long, int, int)
		* #see queryDetailsForUidTagState(int, String, long, long, int, int, int)
		*/
		public NetworkStats queryDetailsForUid(int networkType, String subscriberId,
		long startTime, long endTime, int uid) throws SecurityException, RemoteException {
		return queryDetailsForUidTag(networkType, subscriberId, startTime, endTime, uid,
		NetworkStats.Bucket.TAG_NONE);
		long startTime, long endTime, int uid) throws SecurityException {
		return queryDetailsForUidTagState(networkType, subscriberId, startTime, endTime, uid,
		NetworkStats.Bucket.TAG_NONE, NetworkStats.Bucket.STATE_ALL);
		}

		/**
		* Query network usage statistics details for a given uid and tag. Only usable for uids
		* belonging to calling user. Result is aggregated over state but not aggregated over time.
		* This means buckets' start and end timestamps are going to be between 'startTime' and
		* 'endTime' parameters. State is going to be {@link NetworkStats.Bucket#STATE_ALL}, uid the
		* same as the 'uid' parameter and tag the same as 'tag' parameter.
		* Query network usage statistics details for a given uid and tag.
		*
		* #see queryDetailsForUidTagState(int, String, long, long, int, int, int)
		*/
		public NetworkStats queryDetailsForUidTag(int networkType, String subscriberId,
		long startTime, long endTime, int uid, int tag) throws SecurityException {
		return queryDetailsForUidTagState(networkType, subscriberId, startTime, endTime, uid,
		tag, NetworkStats.Bucket.STATE_ALL);
		}

		/**
		* Query network usage statistics details for a given uid, tag, and state. Only usable for uids
		* belonging to calling user. Result is not aggregated over time. This means buckets' start and
		* end timestamps are going to be between 'startTime' and 'endTime' parameters. The uid is going
		* to be the same as the 'uid' parameter, the tag the same as the 'tag' parameter, and the state
		* the same as the 'state' parameter.
		* defaultNetwork is going to be {@link NetworkStats.Bucket#DEFAULT_NETWORK_ALL},
		* metered is going to be {@link NetworkStats.Bucket#METERED_ALL}, and
		* roaming is going to be {@link NetworkStats.Bucket#ROAMING_ALL}.
		@@ -297,17 +308,18 @@ public class NetworkStatsManager {
		* @return Statistics object or null if an error happened during statistics collection.
		* @throws SecurityException if permissions are insufficient to read network statistics.
		*/
		public NetworkStats queryDetailsForUidTag(int networkType, String subscriberId,
		long startTime, long endTime, int uid, int tag) throws SecurityException {
		public NetworkStats queryDetailsForUidTagState(int networkType, String subscriberId,
		long startTime, long endTime, int uid, int tag, int state) throws SecurityException {
		NetworkTemplate template;
		template = createTemplate(networkType, subscriberId);

		NetworkStats result;
		try {
		result = new NetworkStats(mContext, template, mFlags, startTime, endTime, mService);
		result.startHistoryEnumeration(uid, tag);
		result.startHistoryEnumeration(uid, tag, state);
		} catch (RemoteException e) {
		Log.e(TAG, "Error while querying stats for uid=" + uid + " tag=" + tag, e);
		Log.e(TAG, "Error while querying stats for uid=" + uid + " tag=" + tag
		+ " state=" + state, e);
		return null;
		}