LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert Network Stats API stub for tracking of metered networks.

Browse Source 
Bug: 25813958
Change-Id: I9d2835b7bacfffef05b1588f1301afc70f5f582f
This commit is contained in:
Jeff Davidson
2016-01-29 10:36:52 -08:00
parent 4ff8b948b0
commit 3bbf8f320d
1 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/android/app/usage/NetworkStats.java
View File

@@ -150,21 +150,6 @@ public final class NetworkStats implements AutoCloseable {
*/ */
public static final int UID_TETHERING = TrafficStats.UID_TETHERING; 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. * Combined usage across all roaming states.
*/ */
@@ -182,7 +167,6 @@ public final class NetworkStats implements AutoCloseable {
private int mUid; private int mUid;
private int mState; private int mState;
private int mMetering;
private int mRoaming; private int mRoaming;
private long mBeginTimeStamp; private long mBeginTimeStamp;
private long mEndTimeStamp; private long mEndTimeStamp;
@@ -246,18 +230,6 @@ public final class NetworkStats implements AutoCloseable {
return mState; 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/> * Roaming state. One of the following values:<p/>
* <ul> * <ul>
@@ -463,8 +435,6 @@ public final class NetworkStats implements AutoCloseable {
private void fillBucketFromSummaryEntry(Bucket bucketOut) { private void fillBucketFromSummaryEntry(Bucket bucketOut) {
bucketOut.mUid = Bucket.convertUid(mRecycledSummaryEntry.uid); bucketOut.mUid = Bucket.convertUid(mRecycledSummaryEntry.uid);
bucketOut.mState = Bucket.convertState(mRecycledSummaryEntry.set); bucketOut.mState = Bucket.convertState(mRecycledSummaryEntry.set);
// TODO: Implement metering tracking.
bucketOut.mMetering = Bucket.METERING_ALL;
bucketOut.mRoaming = Bucket.convertRoaming(mRecycledSummaryEntry.roaming); bucketOut.mRoaming = Bucket.convertRoaming(mRecycledSummaryEntry.roaming);
bucketOut.mBeginTimeStamp = mStartTimeStamp; bucketOut.mBeginTimeStamp = mStartTimeStamp;
bucketOut.mEndTimeStamp = mEndTimeStamp; bucketOut.mEndTimeStamp = mEndTimeStamp;
@@ -512,7 +482,6 @@ public final class NetworkStats implements AutoCloseable {
mRecycledHistoryEntry); mRecycledHistoryEntry);
bucketOut.mUid = Bucket.convertUid(getUid()); bucketOut.mUid = Bucket.convertUid(getUid());
bucketOut.mState = Bucket.STATE_ALL; bucketOut.mState = Bucket.STATE_ALL;
bucketOut.mMetering = Bucket.METERING_ALL;
bucketOut.mRoaming = Bucket.ROAMING_ALL; bucketOut.mRoaming = Bucket.ROAMING_ALL;
bucketOut.mBeginTimeStamp = mRecycledHistoryEntry.bucketStart; bucketOut.mBeginTimeStamp = mRecycledHistoryEntry.bucketStart;
bucketOut.mEndTimeStamp = mRecycledHistoryEntry.bucketStart + bucketOut.mEndTimeStamp = mRecycledHistoryEntry.bucketStart +