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-qpr1-dev am: d5cee06acc

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

Change-Id: I4fe863e72f6f15c448f984ac1268462d51ef352b
This commit is contained in:
Sudheer Shanka
2021-09-15 14:53:07 +00:00
committed by Automerger Merge Worker
parent 75891d4d17 d5cee06acc
commit 2364d4fe4b
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,7 +436,6 @@ public final class SystemServer implements Dumpable {
private static final String SYSPROP_START_UPTIME = "sys.system_server.start_uptime"; private static final String SYSPROP_START_UPTIME = "sys.system_server.start_uptime";
private Future<?> mZygotePreload; private Future<?> mZygotePreload;
private Future<?> mBlobStoreServiceStart;
private final SystemServerDumper mDumper = new SystemServerDumper(); private final SystemServerDumper mDumper = new SystemServerDumper();
@@ -2251,12 +2250,9 @@ public final class SystemServer implements Dumpable {
t.traceEnd(); t.traceEnd();
} }
mBlobStoreServiceStart = SystemServerInitThreadPool.submit(() -> { t.traceBegin(START_BLOB_STORE_SERVICE);
final TimingsTraceAndSlog traceLog = TimingsTraceAndSlog.newAsyncLog();
traceLog.traceBegin(START_BLOB_STORE_SERVICE);
mSystemServiceManager.startService(BLOB_STORE_MANAGER_SERVICE_CLASS); mSystemServiceManager.startService(BLOB_STORE_MANAGER_SERVICE_CLASS);
traceLog.traceEnd(); t.traceEnd();
}, START_BLOB_STORE_SERVICE);
// Dreams (interactive idle-time views, a/k/a screen savers, and doze mode) // Dreams (interactive idle-time views, a/k/a screen savers, and doze mode)
t.traceBegin("StartDreamManager"); t.traceBegin("StartDreamManager");
@@ -2655,9 +2651,6 @@ public final class SystemServer implements Dumpable {
mSystemServiceManager.startService(MEDIA_COMMUNICATION_SERVICE_CLASS); mSystemServiceManager.startService(MEDIA_COMMUNICATION_SERVICE_CLASS);
t.traceEnd(); t.traceEnd();
ConcurrentUtils.waitForFutureNoInterrupt(mBlobStoreServiceStart,
START_BLOB_STORE_SERVICE);
// These are needed to propagate to the runnable below. // These are needed to propagate to the runnable below.
final NetworkManagementService networkManagementF = networkManagement; final NetworkManagementService networkManagementF = networkManagement;
final NetworkStatsService networkStatsF = networkStats; final NetworkStatsService networkStatsF = networkStats;