diff options
| author | Yurii Zubrytskyi <zyy@google.com> | 2020-04-22 18:42:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-22 18:42:20 +0000 |
| commit | 0e87d5ebc194b8fa175b3c27e4c895b27fa4bd51 (patch) | |
| tree | d2b28e379f50b55cf174ed189cf3e73ce973249c /services/java/com/android/server/SystemServer.java | |
| parent | b3e5d0677dd20884cce1b7da540e2b6858369860 (diff) | |
| parent | 930f1d10bc630a07e9fef0452f0821ce5135fea6 (diff) | |
Merge changes I8942a2db,Ibcef3f40,I6e765563 into rvc-dev am: 930f1d10bc
Change-Id: I7ba1058a91b3e2140e05b69d749cc65d62511251
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index cf6baf2c12d0..96635b902fee 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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 |