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

Merge "Avoid updating thresholds during shutdown." into jb-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-05-10 10:35:45 -07:00
committed by Android (Google) Code Review
parent ccd90baa9d b9439a4c2a
commit 50c921475b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/net/NetworkStatsService.java
View File

@@ -608,17 +608,19 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
// clamp threshold into safe range // clamp threshold into safe range
mPersistThreshold = MathUtils.constrain(thresholdBytes, 128 * KB_IN_BYTES, 2 * MB_IN_BYTES); mPersistThreshold = MathUtils.constrain(thresholdBytes, 128 * KB_IN_BYTES, 2 * MB_IN_BYTES);
updatePersistThresholds();
if (LOGV) { if (LOGV) {
Slog.v(TAG, "advisePersistThreshold() given " + thresholdBytes + ", clamped to " Slog.v(TAG, "advisePersistThreshold() given " + thresholdBytes + ", clamped to "
+ mPersistThreshold); + mPersistThreshold);
} }
// persist if beyond new thresholds // update and persist if beyond new thresholds
final long currentTime = mTime.hasCache() ? mTime.currentTimeMillis() final long currentTime = mTime.hasCache() ? mTime.currentTimeMillis()
: System.currentTimeMillis(); : System.currentTimeMillis();
synchronized (mStatsLock) { synchronized (mStatsLock) {
if (!mSystemReady) return;
updatePersistThresholds();
mDevRecorder.maybePersistLocked(currentTime); mDevRecorder.maybePersistLocked(currentTime);
mXtRecorder.maybePersistLocked(currentTime); mXtRecorder.maybePersistLocked(currentTime);
mUidRecorder.maybePersistLocked(currentTime); mUidRecorder.maybePersistLocked(currentTime);