am c88047bf: Merge "Move NTP updates outside locks"

* commit 'c88047bf86fd83e5b0204d26b35776cad97ed877': Move NTP updates outside locks
2012-11-27 12:57:54 -08:00
parent 10c29234aa c88047bf86
commit ae0edeb3e5
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
@@ -939,14 +939,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 {