commit 5bfa752f71cf7e6a5e7490d48eaef4054f99bebc
author Jeff Sharkey <jsharkey@android.com> Fri Jun 17 11:28:31 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 17 11:28:31 2011 -0700
tree 9916cd961a2c60573f0a6e7f61a80bbb101e2752
parent 395eef3bb6330f2d29fa7a2aaea145822e0fe2a2
parent af8339374fbf1e2f57b0be918c7fc772f4250f13

Merge "Avoid clobbering UID stats when not yet loaded."

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 f762123..0a84bc7 100644
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -225,7 +225,9 @@
         mContext.unregisterReceiver(mShutdownReceiver);
 
         writeNetworkStatsLocked();
-        writeUidStatsLocked();
+        if (mUidStatsLoaded) {
+            writeUidStatsLocked();
+        }
         mNetworkStats.clear();
         mUidStats.clear();
         mUidStatsLoaded = false;
@@ -442,7 +444,9 @@
             if (persistDelta.rx[index] > persistThreshold
                     || persistDelta.tx[index] > persistThreshold) {
                 writeNetworkStatsLocked();
-                writeUidStatsLocked();
+                if (mUidStatsLoaded) {
+                    writeUidStatsLocked();
+                }
                 mLastNetworkPersist = networkStats;
                 break;
             }