Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 336291ea authored by Ben Miles's avatar Ben Miles Committed by Android (Google) Code Review
Browse files

Merge "Move critical event log initialization to end of AMS.start"

parents d9dfc030 0b045240

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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() {