am 49e27d5f: am ae0edeb3: am c88047bf: Merge "Move NTP updates outside locks"

* commit '49e27d5f9d77316350be6a119bad717d38ce5d95': Move NTP updates outside locks
2012-11-27 18:42:45 -08:00
parent 45dfdd6bc8 49e27d5f9d
commit ebdcabef44
1 changed files with 5 additions and 5 deletions
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -940,14 +940,14 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
    }

    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 {