Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 009a848d authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Change sync manager init timing back to PHASE_ACTIVITY_MANAGER_READY"

parents ccbb3fa4 d0c50dd0

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

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ public final class ContentService extends IContentService.Stub { 


    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

+2 −2
Original line number Diff line number Diff line
@@ -747,9 +747,9 @@ public class SyncManager { 
    }



    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;

        }