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

Commit cc1a23ae authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Start blob store service synchronously." into sc-v2-dev am: 6ef8d619 am: 7fe1e687 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15717104

Change-Id: I0fc91f8360b3991f267de1944e44eb848476c5a8
parents 4222ee8d 7fe1e687

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

+3 −10
Original line number Diff line number Diff line
@@ -440,7 +440,6 @@ public final class SystemServer implements Dumpable { 
    private static final String SYSPROP_START_UPTIME = "sys.system_server.start_uptime";



    private Future<?> mZygotePreload;

    private Future<?> mBlobStoreServiceStart;



    private final SystemServerDumper mDumper = new SystemServerDumper();
@@ -2262,12 +2261,9 @@ public final class SystemServer implements Dumpable { 
                t.traceEnd();

            }



            mBlobStoreServiceStart = SystemServerInitThreadPool.submit(() -> {

                final TimingsTraceAndSlog traceLog = TimingsTraceAndSlog.newAsyncLog();

                traceLog.traceBegin(START_BLOB_STORE_SERVICE);

            t.traceBegin(START_BLOB_STORE_SERVICE);

            mSystemServiceManager.startService(BLOB_STORE_MANAGER_SERVICE_CLASS);

                traceLog.traceEnd();

            }, START_BLOB_STORE_SERVICE);

            t.traceEnd();



            // Dreams (interactive idle-time views, a/k/a screen savers, and doze mode)

            t.traceBegin("StartDreamManager");
@@ -2673,9 +2669,6 @@ public final class SystemServer implements Dumpable { 
        mSystemServiceManager.startService(APP_COMPAT_OVERRIDES_SERVICE_CLASS);

        t.traceEnd();



        ConcurrentUtils.waitForFutureNoInterrupt(mBlobStoreServiceStart,

                START_BLOB_STORE_SERVICE);



        // These are needed to propagate to the runnable below.

        final NetworkManagementService networkManagementF = networkManagement;

        final NetworkStatsService networkStatsF = networkStats;