commit 3e09cd4d79f8bd583f833ba4c37868a7d3f3746a
author Shreyas Basarge <snb@google.com> Mon Feb 22 16:48:01 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 22 16:48:02 2016 +0000
tree c70fbcabac7d3cfcec98bdc8ffd357810e9e5e63
parent 7060ae91b90c3e61323379a6c19a4fbbd4464298
parent 3147bbc164d0b69d35caea05dfa3fb4fd86e2b61

Merge "Migrate PeriodicSyncs from old format" into nyc-dev

services/core/java/com/android/server/content/SyncManager.java

diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java
index 0d97434..d8921d8 100644
--- a/services/core/java/com/android/server/content/SyncManager.java
+++ b/services/core/java/com/android/server/content/SyncManager.java
@@ -2271,6 +2271,7 @@
         void checkIfDeviceReady() {
             if (mProvisioned && mBootCompleted) {
                 synchronized(this) {
+                    mSyncStorageEngine.restoreAllPeriodicSyncs();
                     // Dispatch any stashed messages.
                     obtainMessage(MESSAGE_RELEASE_MESSAGES_FROM_QUEUE).sendToTarget();
                 }
@@ -2622,7 +2623,6 @@
             }
             if (mBootCompleted) {
                 doDatabaseCleanup();
-                mSyncStorageEngine.restoreAllPeriodicSyncs();
             }
 
             AccountAndUser[] accounts = mRunningAccounts;