From 24a69bbd60851ca4b45cb1b07764e8cd58c51f93 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Mon, 7 May 2012 11:08:49 -0700
Subject: [PATCH] Ack, wrap advisePersistThreshold() in lock.

Bug: 6449725
Change-Id: I702dc2ff9d4b237c46d89bcae41289bc3e9ef2f8
---
 .../com/android/server/net/NetworkStatsService.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
index a9d4b59622..1a56b80d7e 100644
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -616,10 +616,12 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
         // 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();