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

Snap for 4683893 from f0edf03edaaf15a48295ce87baae93e1a7db0122 to pi-release

Browse Source 
Change-Id: I8a450a70da831c3964896b1ba09467cf62f9c138
This commit is contained in:
android-build-team Robot
2018-03-28 07:25:50 +00:00
parent 38d995bf0f 662cedc67c
commit a63e18784f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/net/NetworkStatsCollection.java
View File

@@ -16,9 +16,9 @@
package com.android.server.net; package com.android.server.net;
import static android.net.NetworkStats.IFACE_ALL;
import static android.net.NetworkStats.DEFAULT_NETWORK_NO; import static android.net.NetworkStats.DEFAULT_NETWORK_NO;
import static android.net.NetworkStats.DEFAULT_NETWORK_YES; import static android.net.NetworkStats.DEFAULT_NETWORK_YES;
import static android.net.NetworkStats.IFACE_ALL;
import static android.net.NetworkStats.METERED_NO; import static android.net.NetworkStats.METERED_NO;
import static android.net.NetworkStats.METERED_YES; import static android.net.NetworkStats.METERED_YES;
import static android.net.NetworkStats.ROAMING_NO; import static android.net.NetworkStats.ROAMING_NO;
@@ -42,9 +42,11 @@ import android.service.NetworkStatsCollectionKeyProto;
import android.service.NetworkStatsCollectionProto; import android.service.NetworkStatsCollectionProto;
import android.service.NetworkStatsCollectionStatsProto; import android.service.NetworkStatsCollectionStatsProto;
import android.telephony.SubscriptionPlan; import android.telephony.SubscriptionPlan;
import android.text.format.DateUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.AtomicFile; import android.util.AtomicFile;
import android.util.IntArray; import android.util.IntArray;
import android.util.MathUtils;
import android.util.Pair; import android.util.Pair;
import android.util.Slog; import android.util.Slog;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
@@ -245,7 +247,10 @@ public class NetworkStatsCollection implements FileRotator.Reader {
+ " is forbidden for caller " + callerUid); + " is forbidden for caller " + callerUid);
} }
final int bucketEstimate = (int) ((end - start) / mBucketDuration); // 180 days of history should be enough for anyone; if we end up needing
// more, we'll dynamically grow the history object.
final int bucketEstimate = (int) MathUtils.constrain(((end - start) / mBucketDuration), 0,
(180 * DateUtils.DAY_IN_MILLIS) / mBucketDuration);
final NetworkStatsHistory combined = new NetworkStatsHistory( final NetworkStatsHistory combined = new NetworkStatsHistory(
mBucketDuration, bucketEstimate, fields); mBucketDuration, bucketEstimate, fields);