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

* commit 'ae0edeb3e56c6aae113f8c5eaa3a03b79c00a93e':
  Move NTP updates outside locks
This commit is contained in:
Kenny Root
2012-11-27 13:00:01 -08:00
committed by Android Git Automerger

View File

@@ -940,14 +940,14 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
} }
private void performPoll(int flags) { private void performPoll(int flags) {
// try refreshing time source when stale
if (mTime.getCacheAge() > mSettings.getTimeCacheMaxAge()) {
mTime.forceRefresh();
}
synchronized (mStatsLock) { synchronized (mStatsLock) {
mWakeLock.acquire(); mWakeLock.acquire();
// try refreshing time source when stale
if (mTime.getCacheAge() > mSettings.getTimeCacheMaxAge()) {
mTime.forceRefresh();
}
try { try {
performPollLocked(flags); performPollLocked(flags);
} finally { } finally {