Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix race condition in MetricsLoggerService" into nyc-dev

Browse Source
This commit is contained in:
Pavel Zhamaitsiak
2016-05-04 17:02:16 +00:00
committed by Android (Google) Code Review
parent 3fff306827 e8fc84b449
commit be3e539ff7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/connectivity/MetricsLoggerService.java
View File

@@ -106,12 +106,14 @@ public class MetricsLoggerService extends SystemService {
} }
private void resetThrottlingCounters(long currentTimeMillis) { private void resetThrottlingCounters(long currentTimeMillis) {
synchronized (mThrottlingCounters) {
for (int i = 0; i < mThrottlingCounters.length; i++) { for (int i = 0; i < mThrottlingCounters.length; i++) {
mThrottlingCounters[i] = 0; mThrottlingCounters[i] = 0;
} }
mThrottlingIntervalBoundaryMillis = mThrottlingIntervalBoundaryMillis =
currentTimeMillis + THROTTLING_TIME_INTERVAL_MILLIS; currentTimeMillis + THROTTLING_TIME_INTERVAL_MILLIS;
} }
}
private void addEvent(ConnectivityMetricsEvent e) { private void addEvent(ConnectivityMetricsEvent e) {
if (VDBG) { if (VDBG) {