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

Merge "[DU09-2]Modify the NetworkStatsCollection Builder API" am: 23599d75af am: 57e0845a65

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2010324

Change-Id: I0dcba0cbb7ff44cbb73cbd0f20106f81728f3109
This commit is contained in:
Frank Li
2022-03-14 03:21:25 +00:00
committed by Automerger Merge Worker
parent 0884cf9c15 57e0845a65
commit bd3d328807
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
framework-t/src/android/net/NetworkStatsCollection.java
View File

@@ -36,6 +36,7 @@ import static com.android.net.module.util.NetworkStatsUtils.multiplySafeByRation
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.net.NetworkStats.State;
import android.net.NetworkStatsHistory.Entry; import android.net.NetworkStatsHistory.Entry;
import android.os.Binder; import android.os.Binder;
import android.service.NetworkStatsCollectionKeyProto; import android.service.NetworkStatsCollectionKeyProto;
@@ -102,7 +103,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
private ArrayMap<Key, NetworkStatsHistory> mStats = new ArrayMap<>(); private ArrayMap<Key, NetworkStatsHistory> mStats = new ArrayMap<>();
private final long mBucketDuration; private final long mBucketDurationMillis;
private long mStartMillis; private long mStartMillis;
private long mEndMillis; private long mEndMillis;
@@ -115,8 +116,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
* @param bucketDuration duration of the buckets in this object, in milliseconds. * @param bucketDuration duration of the buckets in this object, in milliseconds.
* @hide * @hide
*/ */
public NetworkStatsCollection(long bucketDuration) { public NetworkStatsCollection(long bucketDurationMillis) {
mBucketDuration = bucketDuration; mBucketDurationMillis = bucketDurationMillis;
reset(); reset();
} }
@@ -148,7 +149,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
if (mStartMillis == Long.MAX_VALUE) { if (mStartMillis == Long.MAX_VALUE) {
return Long.MAX_VALUE; return Long.MAX_VALUE;
} else { } else {
return mStartMillis + mBucketDuration; return mStartMillis + mBucketDurationMillis;
} }
} }
@@ -184,10 +185,10 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
|| time == SubscriptionPlan.TIME_UNKNOWN) { || time == SubscriptionPlan.TIME_UNKNOWN) {
return time; return time;
} else { } else {
final long mod = time % mBucketDuration; final long mod = time % mBucketDurationMillis;
if (mod > 0) { if (mod > 0) {
time -= mod; time -= mod;
time += mBucketDuration; time += mBucketDurationMillis;
} }
return time; return time;
} }
@@ -200,7 +201,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
|| time == SubscriptionPlan.TIME_UNKNOWN) { || time == SubscriptionPlan.TIME_UNKNOWN) {
return time; return time;
} else { } else {
final long mod = time % mBucketDuration; final long mod = time % mBucketDurationMillis;
if (mod > 0) { if (mod > 0) {
time -= mod; time -= mod;
} }
@@ -247,10 +248,10 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
// 180 days of history should be enough for anyone; if we end up needing // 180 days of history should be enough for anyone; if we end up needing
// more, we'll dynamically grow the history object. // more, we'll dynamically grow the history object.
final int bucketEstimate = (int) NetworkStatsUtils.constrain( final int bucketEstimate = (int) NetworkStatsUtils.constrain(
((end - start) / mBucketDuration), 0, ((end - start) / mBucketDurationMillis), 0,
(180 * DateUtils.DAY_IN_MILLIS) / mBucketDuration); (180 * DateUtils.DAY_IN_MILLIS) / mBucketDurationMillis);
final NetworkStatsHistory combined = new NetworkStatsHistory( final NetworkStatsHistory combined = new NetworkStatsHistory(
mBucketDuration, bucketEstimate, fields); mBucketDurationMillis, bucketEstimate, fields);
// shortcut when we know stats will be empty // shortcut when we know stats will be empty
if (start == end) return combined; if (start == end) return combined;
@@ -343,7 +344,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
// Finally we can slice data as originally requested // Finally we can slice data as originally requested
final NetworkStatsHistory sliced = new NetworkStatsHistory( final NetworkStatsHistory sliced = new NetworkStatsHistory(
mBucketDuration, bucketEstimate, fields); mBucketDurationMillis, bucketEstimate, fields);
sliced.recordHistory(combined, start, end); sliced.recordHistory(combined, start, end);
return sliced; return sliced;
} else { } else {
@@ -458,9 +459,9 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
// update when no existing, or when bucket duration changed // update when no existing, or when bucket duration changed
NetworkStatsHistory updated = null; NetworkStatsHistory updated = null;
if (existing == null) { if (existing == null) {
updated = new NetworkStatsHistory(mBucketDuration, 10); updated = new NetworkStatsHistory(mBucketDurationMillis, 10);
} else if (existing.getBucketDuration() != mBucketDuration) { } else if (existing.getBucketDuration() != mBucketDurationMillis) {
updated = new NetworkStatsHistory(existing, mBucketDuration); updated = new NetworkStatsHistory(existing, mBucketDurationMillis);
} }
if (updated != null) { if (updated != null) {
@@ -702,7 +703,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
private int estimateBuckets() { private int estimateBuckets() {
return (int) (Math.min(mEndMillis - mStartMillis, WEEK_IN_MILLIS * 5) return (int) (Math.min(mEndMillis - mStartMillis, WEEK_IN_MILLIS * 5)
/ mBucketDuration); / mBucketDurationMillis);
} }
private ArrayList<Key> getSortedKeys() { private ArrayList<Key> getSortedKeys() {
@@ -828,7 +829,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
* Builder class for {@link NetworkStatsCollection}. * Builder class for {@link NetworkStatsCollection}.
*/ */
public static final class Builder { public static final class Builder {
private final long mBucketDuration; private final long mBucketDurationMillis;
private final ArrayMap<Key, NetworkStatsHistory> mEntries = new ArrayMap<>(); private final ArrayMap<Key, NetworkStatsHistory> mEntries = new ArrayMap<>();
/** /**
@@ -836,8 +837,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
* *
* @param bucketDuration Duration of the buckets of the object, in milliseconds. * @param bucketDuration Duration of the buckets of the object, in milliseconds.
*/ */
public Builder(long bucketDuration) { public Builder(long bucketDurationMillis) {
mBucketDuration = bucketDuration; mBucketDurationMillis = bucketDurationMillis;
} }
/** /**
@@ -855,7 +856,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
final List<Entry> historyEntries = history.getEntries(); final List<Entry> historyEntries = history.getEntries();
final NetworkStatsHistory.Builder historyBuilder = final NetworkStatsHistory.Builder historyBuilder =
new NetworkStatsHistory.Builder(mBucketDuration, historyEntries.size()); new NetworkStatsHistory.Builder(mBucketDurationMillis, historyEntries.size());
for (Entry entry : historyEntries) { for (Entry entry : historyEntries) {
historyBuilder.addEntry(entry); historyBuilder.addEntry(entry);
} }
@@ -871,7 +872,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
*/ */
@NonNull @NonNull
public NetworkStatsCollection build() { public NetworkStatsCollection build() {
final NetworkStatsCollection collection = new NetworkStatsCollection(mBucketDuration); final NetworkStatsCollection collection =
new NetworkStatsCollection(mBucketDurationMillis);
for (int i = 0; i < mEntries.size(); i++) { for (int i = 0; i < mEntries.size(); i++) {
collection.recordHistory(mEntries.keyAt(i), mEntries.valueAt(i)); collection.recordHistory(mEntries.keyAt(i), mEntries.valueAt(i));
} }
@@ -883,7 +885,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
* the identifier that associate with the {@link NetworkStatsHistory} object to identify * the identifier that associate with the {@link NetworkStatsHistory} object to identify
* a certain record in the {@link NetworkStatsCollection} object. * a certain record in the {@link NetworkStatsCollection} object.
*/ */
public static class Key { public static final class Key {
/** @hide */ /** @hide */
public final NetworkIdentitySet ident; public final NetworkIdentitySet ident;
/** @hide */ /** @hide */
@@ -903,7 +905,7 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
* @param set Set of the record, see {@code NetworkStats#SET_*}. * @param set Set of the record, see {@code NetworkStats#SET_*}.
* @param tag Tag of the record, see {@link TrafficStats#setThreadStatsTag(int)}. * @param tag Tag of the record, see {@link TrafficStats#setThreadStatsTag(int)}.
*/ */
public Key(@NonNull Set<NetworkIdentity> ident, int uid, int set, int tag) { public Key(@NonNull Set<NetworkIdentity> ident, int uid, @State int set, int tag) {
this(new NetworkIdentitySet(Objects.requireNonNull(ident)), uid, set, tag); this(new NetworkIdentitySet(Objects.requireNonNull(ident)), uid, set, tag);
} }