commit d0c50dd05cfcddd0868094ecf205b1fadcf34629
author Makoto Onuki <omakoto@google.com> Fri Feb 16 09:52:50 2018 -0800
committer Makoto Onuki <omakoto@google.com> Fri Feb 16 09:54:29 2018 -0800
tree 04bbf663c1143d3b69fd389f5e9c9a15ee559554
parent f9a02975eaa5a36584eb1f214193d24053af73f1

Change sync manager init timing back to PHASE_ACTIVITY_MANAGER_READY

Bug: 73350582
Test: boot
Test: atest CtsSyncManagerTest
Change-Id: Ib4948af473d9381882d30c03a63a306b73204704

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

diff --git a/services/core/java/com/android/server/content/ContentService.java b/services/core/java/com/android/server/content/ContentService.java
index 95a0246..63308f8 100644
--- a/services/core/java/com/android/server/content/ContentService.java
+++ b/services/core/java/com/android/server/content/ContentService.java
@@ -300,7 +300,7 @@
 
     void onBootPhase(int phase) {
         switch (phase) {
-            case SystemService.PHASE_SYSTEM_SERVICES_READY:
+            case SystemService.PHASE_ACTIVITY_MANAGER_READY:
                 getSyncManager();
                 break;
         }

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 d87a1bb..0244dbb 100644
--- a/services/core/java/com/android/server/content/SyncManager.java
+++ b/services/core/java/com/android/server/content/SyncManager.java
@@ -747,9 +747,9 @@
     }
 
     public void onBootPhase(int phase) {
-        // Note SyncManager only receives PHASE_SYSTEM_SERVICES_READY and after.
+        // Note SyncManager only receives PHASE_ACTIVITY_MANAGER_READY and after.
         switch (phase) {
-            case SystemService.PHASE_SYSTEM_SERVICES_READY:
+            case SystemService.PHASE_ACTIVITY_MANAGER_READY:
                 mConstants.start();
                 break;
         }