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

Commit 683f2b1a authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi
Browse files

[incfs] Notify IncrementalService about system startup later 

It needs system to be ready to bind to services, which is much
later in the boot process

Bug: 151241369
Test: boot up Android, make sure no error messages from
  IncrementalService trying to bind a DataLoader when the OS
  can't bind services yet
Change-Id: Ibcef3f405965ee07c5b8adbb41f068be734bde9e
parent 529a37d3

services/java/com/android/server/SystemServer.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -2174,12 +2174,6 @@ public final class SystemServer { 
        mPackageManagerService.systemReady();

        mPackageManagerService.systemReady();

        t.traceEnd();

        t.traceEnd();





        if (mIncrementalServiceHandle != 0) {

            t.traceBegin("MakeIncrementalServiceReady");

            setIncrementalServiceSystemReady(mIncrementalServiceHandle);

            t.traceEnd();

        }



        t.traceBegin("MakeDisplayManagerServiceReady");

        t.traceBegin("MakeDisplayManagerServiceReady");

        try {

        try {

            // TODO: use boot phase and communicate these flags some other way

            // TODO: use boot phase and communicate these flags some other way
@@ -2449,6 +2443,12 @@ public final class SystemServer { 
                reportWtf("Notifying incident daemon running", e);

                reportWtf("Notifying incident daemon running", e);

            }

            }

            t.traceEnd();

            t.traceEnd();



            if (mIncrementalServiceHandle != 0) {

                t.traceBegin("MakeIncrementalServiceReady");

                setIncrementalServiceSystemReady(mIncrementalServiceHandle);

                t.traceEnd();

            }

        }, t);

        }, t);





        t.traceEnd(); // startOtherServices

        t.traceEnd(); // startOtherServices