Merge "Start blob store service synchronously." into sc-qpr1-dev (d5cee06a) · Commits · e / os / android_frameworks_base

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

+3 −10

Original line number	Diff line number	Diff line
		@@ -435,7 +435,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();

		@@ -2250,12 +2249,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");
		@@ -2650,9 +2646,6 @@ public final class SystemServer implements Dumpable {
		mSystemServiceManager.startService(MEDIA_COMMUNICATION_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;