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 
am: be3e539ff7

* commit 'be3e539ff7b26d497f930fb2faf761e94fa99297':
  Fix race condition in MetricsLoggerService

Change-Id: I6c5b3d2b4889bef57ff169199081bdb79b8117e8
This commit is contained in:
Pavel Zhamaitsiak
2016-05-04 17:30:17 +00:00
committed by android-build-merger
parent 1d8b98bdd3 be3e539ff7
commit 54b3111fca
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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