From 0b04524085148d6d9fe22b176ab13bfebde3a7e0 Mon Sep 17 00:00:00 2001
From: Ben Miles <benmiles@google.com>
Date: Tue, 19 Oct 2021 11:09:09 +0100
Subject: [PATCH] Move critical event log initialization to end of AMS.start

Change-Id: I6ee3741cfa118dca7f70553677e0fb3d97151dbd
Test: atest CriticalEventLogTest
Bug: 202123544
---
 .../core/java/com/android/server/am/ActivityManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index b19493061033c..fe9244f02c6a7 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -2394,7 +2394,6 @@ public class ActivityManagerService extends IActivityManager.Stub
     private void start() {
         removeAllProcessGroups();
 
-        CriticalEventLog.init();
         mBatteryStatsService.publish();
         mAppOpsService.publish();
         Slog.d("AppOps", "AppOpsService published");
@@ -2404,6 +2403,7 @@ public class ActivityManagerService extends IActivityManager.Stub
         mActivityTaskManager.onActivityManagerInternalAdded();
         mPendingIntentController.onActivityManagerInternalAdded();
         mAppProfiler.onActivityManagerInternalAdded();
+        CriticalEventLog.init();
     }
 
     public void initPowerManagement() {