Merge "Revert Network Stats API stub for tracking of metered networks." (3c2feda8) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -6319,7 +6319,6 @@ package android.app.usage {
		public static class NetworkStats.Bucket {
		ctor public NetworkStats.Bucket();
		method public long getEndTimeStamp();
		method public int getMetering();
		method public int getRoaming();
		method public long getRxBytes();
		method public long getRxPackets();
		@@ -6328,9 +6327,6 @@ package android.app.usage {
		method public long getTxBytes();
		method public long getTxPackets();
		method public int getUid();
		field public static final int METERING_ALL = -1; // 0xffffffff
		field public static final int METERING_DEFAULT = 1; // 0x1
		field public static final int METERING_METERED = 2; // 0x2
		field public static final int ROAMING_ALL = -1; // 0xffffffff
		field public static final int ROAMING_DEFAULT = 1; // 0x1
		field public static final int ROAMING_ROAMING = 2; // 0x2

api/system-current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -6576,7 +6576,6 @@ package android.app.usage {
		public static class NetworkStats.Bucket {
		ctor public NetworkStats.Bucket();
		method public long getEndTimeStamp();
		method public int getMetering();
		method public int getRoaming();
		method public long getRxBytes();
		method public long getRxPackets();
		@@ -6585,9 +6584,6 @@ package android.app.usage {
		method public long getTxBytes();
		method public long getTxPackets();
		method public int getUid();
		field public static final int METERING_ALL = -1; // 0xffffffff
		field public static final int METERING_DEFAULT = 1; // 0x1
		field public static final int METERING_METERED = 2; // 0x2
		field public static final int ROAMING_ALL = -1; // 0xffffffff
		field public static final int ROAMING_DEFAULT = 1; // 0x1
		field public static final int ROAMING_ROAMING = 2; // 0x2

api/test-current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -6321,7 +6321,6 @@ package android.app.usage {
		public static class NetworkStats.Bucket {
		ctor public NetworkStats.Bucket();
		method public long getEndTimeStamp();
		method public int getMetering();
		method public int getRoaming();
		method public long getRxBytes();
		method public long getRxPackets();
		@@ -6330,9 +6329,6 @@ package android.app.usage {
		method public long getTxBytes();
		method public long getTxPackets();
		method public int getUid();
		field public static final int METERING_ALL = -1; // 0xffffffff
		field public static final int METERING_DEFAULT = 1; // 0x1
		field public static final int METERING_METERED = 2; // 0x2
		field public static final int ROAMING_ALL = -1; // 0xffffffff
		field public static final int ROAMING_DEFAULT = 1; // 0x1
		field public static final int ROAMING_ROAMING = 2; // 0x2

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

+0 −31

Original line number	Diff line number	Diff line
		@@ -150,21 +150,6 @@ public final class NetworkStats implements AutoCloseable {
		*/
		public static final int UID_TETHERING = TrafficStats.UID_TETHERING;

		/**
		* Combined usage across all metering states.
		*/
		public static final int METERING_ALL = -1;

		/**
		* Usage not accounted for in any other metering state.
		*/
		public static final int METERING_DEFAULT = 0x1;

		/**
		* Metered usage.
		*/
		public static final int METERING_METERED = 0x2;

		/**
		* Combined usage across all roaming states.
		*/
		@@ -182,7 +167,6 @@ public final class NetworkStats implements AutoCloseable {

		private int mUid;
		private int mState;
		private int mMetering;
		private int mRoaming;
		private long mBeginTimeStamp;
		private long mEndTimeStamp;
		@@ -246,18 +230,6 @@ public final class NetworkStats implements AutoCloseable {
		return mState;
		}

		/**
		* Metering state. One of the following values:<p/>
		* <ul>
		* <li>{@link #METERING_ALL}</li>
		* <li>{@link #METERING_DEFAULT}</li>
		* <li>{@link #METERING_METERED}</li>
		* </ul>
		*/
		public int getMetering() {
		return mMetering;
		}

		/**
		* Roaming state. One of the following values:<p/>
		* <ul>
		@@ -463,8 +435,6 @@ public final class NetworkStats implements AutoCloseable {
		private void fillBucketFromSummaryEntry(Bucket bucketOut) {
		bucketOut.mUid = Bucket.convertUid(mRecycledSummaryEntry.uid);
		bucketOut.mState = Bucket.convertState(mRecycledSummaryEntry.set);
		// TODO: Implement metering tracking.
		bucketOut.mMetering = Bucket.METERING_ALL;
		bucketOut.mRoaming = Bucket.convertRoaming(mRecycledSummaryEntry.roaming);
		bucketOut.mBeginTimeStamp = mStartTimeStamp;
		bucketOut.mEndTimeStamp = mEndTimeStamp;
		@@ -512,7 +482,6 @@ public final class NetworkStats implements AutoCloseable {
		mRecycledHistoryEntry);
		bucketOut.mUid = Bucket.convertUid(getUid());
		bucketOut.mState = Bucket.STATE_ALL;
		bucketOut.mMetering = Bucket.METERING_ALL;
		bucketOut.mRoaming = Bucket.ROAMING_ALL;
		bucketOut.mBeginTimeStamp = mRecycledHistoryEntry.bucketStart;
		bucketOut.mEndTimeStamp = mRecycledHistoryEntry.bucketStart +