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

* commit 'ae0edeb3e56c6aae113f8c5eaa3a03b79c00a93e':
  Move NTP updates outside locks

services/java/com/android/server/net/NetworkStatsService.java

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