commit 24a69bbd60851ca4b45cb1b07764e8cd58c51f93
author Jeff Sharkey <jsharkey@android.com> Mon May 07 11:08:49 2012 -0700
committer Jeff Sharkey <jsharkey@android.com> Mon May 07 11:08:49 2012 -0700
tree 2644e4ec96110a9bfc6d5a0bb4342304549dc666
parent c78bc600399fa14f1024612c31f8858c2007c848

Ack, wrap advisePersistThreshold() in lock.

Bug: 6449725
Change-Id: I702dc2ff9d4b237c46d89bcae41289bc3e9ef2f8

services/java/com/android/server/net/NetworkStatsService.java

diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
index a9d4b59..1a56b80 100644
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -616,10 +616,12 @@
         // persist if beyond new thresholds
         final long currentTime = mTime.hasCache() ? mTime.currentTimeMillis()
                 : System.currentTimeMillis();
-        mDevRecorder.maybePersistLocked(currentTime);
-        mXtRecorder.maybePersistLocked(currentTime);
-        mUidRecorder.maybePersistLocked(currentTime);
-        mUidTagRecorder.maybePersistLocked(currentTime);
+        synchronized (mStatsLock) {
+            mDevRecorder.maybePersistLocked(currentTime);
+            mXtRecorder.maybePersistLocked(currentTime);
+            mUidRecorder.maybePersistLocked(currentTime);
+            mUidTagRecorder.maybePersistLocked(currentTime);
+        }
 
         // re-arm global alert
         registerGlobalAlert();