commit bf76d97d78b0e89eb524c472c15aa249ab4c1c26
author Jeff Sharkey <jsharkey@android.com> Mon Dec 03 11:40:23 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 03 11:40:23 2012 -0800
tree b13d2f89aed526f0e40a8b90be386b47f0b84be6
parent 14418170ff49169130b05e51ac923206de0568e1
parent 17ffba97001adae9366c2c6e2817ac68e90f7929

am 1f8f2839: am ed3fba65: Merge "Avoid null mobile interfaces." into jb-mr1.1-dev

* commit '1f8f283975c7cf51081acd3ea494de2b5f431607':
  Avoid null mobile interfaces.

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

diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
index 546f2be..74be472 100644
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -940,14 +940,14 @@
     }
 
     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 {