Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I674044c4637537977836a8f849da45e659c53b18
This commit is contained in:
Sudheer Shanka
2021-08-31 22:09:47 +00:00
committed by Automerger Merge Worker
parent a7aba2bde0 6ef8d6193c
commit 7fe1e687ca
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/SystemServer.java
View File

@@ -438,7 +438,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();
@@ -2256,12 +2255,9 @@ public final class SystemServer implements Dumpable {
t.traceEnd();
}
mBlobStoreServiceStart = SystemServerInitThreadPool.submit(() -> {
final TimingsTraceAndSlog traceLog = TimingsTraceAndSlog.newAsyncLog();
traceLog.traceBegin(START_BLOB_STORE_SERVICE);
mSystemServiceManager.startService(BLOB_STORE_MANAGER_SERVICE_CLASS);
traceLog.traceEnd();
}, START_BLOB_STORE_SERVICE);
t.traceBegin(START_BLOB_STORE_SERVICE);
mSystemServiceManager.startService(BLOB_STORE_MANAGER_SERVICE_CLASS);
t.traceEnd();
// Dreams (interactive idle-time views, a/k/a screen savers, and doze mode)
t.traceBegin("StartDreamManager");
@@ -2664,9 +2660,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;