commit b04fea024358435114427d53ef2bbff7cf07db7c
author The Android Open Source Project <initial-contribution@android.com> Mon Dec 03 16:39:07 2012 -0800
committer The Android Open Source Project <initial-contribution@android.com> Mon Dec 03 16:39:07 2012 -0800
tree b13d2f89aed526f0e40a8b90be386b47f0b84be6
parent bf76d97d78b0e89eb524c472c15aa249ab4c1c26
parent d7633bb0ad0bb7a29856f4f5d6450f165e366fdc

Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3fbcd93e4cef710bf1562bc7844f4a62f3146e02

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 546f2be..74be472 100644
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -940,14 +940,14 @@
     }
 
     private void performPoll(int flags) {
+        // try refreshing time source when stale
+        if (mTime.getCacheAge() > mSettings.getTimeCacheMaxAge()) {
+            mTime.forceRefresh();
+        }
+
         synchronized (mStatsLock) {
             mWakeLock.acquire();
 
-            // try refreshing time source when stale
-            if (mTime.getCacheAge() > mSettings.getTimeCacheMaxAge()) {
-                mTime.forceRefresh();
-            }
-
             try {
                 performPollLocked(flags);
             } finally {