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

Merge changes I8942a2db,Ibcef3f40,I6e765563 into rvc-dev am: 930f1d10bc

Browse Source 
Change-Id: I7ba1058a91b3e2140e05b69d749cc65d62511251
This commit is contained in:
Yurii Zubrytskyi
2020-04-22 18:42:20 +00:00
committed by Automerger Merge Worker
parent b3e5d0677d 930f1d10bc
commit 0e87d5ebc1
3 changed files with 59 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2168,12 +2168,6 @@ public final class SystemServer {
mPackageManagerService.systemReady();
t.traceEnd();
if (mIncrementalServiceHandle != 0) {
t.traceBegin("MakeIncrementalServiceReady");
setIncrementalServiceSystemReady(mIncrementalServiceHandle);
t.traceEnd();
}
t.traceBegin("MakeDisplayManagerServiceReady");
try {
// TODO: use boot phase and communicate these flags some other way
@@ -2443,6 +2437,12 @@ public final class SystemServer {
reportWtf("Notifying incident daemon running", e);
}
t.traceEnd();
if (mIncrementalServiceHandle != 0) {
t.traceBegin("MakeIncrementalServiceReady");
setIncrementalServiceSystemReady(mIncrementalServiceHandle);
t.traceEnd();
}
}, t);
t.traceEnd(); // startOtherServices