summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kenny Root <kroot@android.com> 2012-11-27 12:57:54 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-11-27 12:57:54 -0800
commitae0edeb3e56c6aae113f8c5eaa3a03b79c00a93e (patch)
tree9175007072ef62851426d6b24e01c30c8ce246cb
parent10c29234aa3494bee7cade0412fb0743b5a0f0ad (diff)
parentc88047bf86fd83e5b0204d26b35776cad97ed877 (diff)
am c88047bf: Merge "Move NTP updates outside locks"
* commit 'c88047bf86fd83e5b0204d26b35776cad97ed877': Move NTP updates outside locks
-rw-r--r--services/java/com/android/server/net/NetworkStatsService.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
index 0efdead7f9e4..a3b44e26d828 100644
--- 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 {