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

Commit 5d61fb37 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Initialize PendingIntentController before ActivityTaskManagerService"

parents f9151368 03cb7ba1

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

+3 −3
Original line number Diff line number Diff line
@@ -2397,6 +2397,9 @@ public class ActivityManagerService extends IActivityManager.Stub 














        mUserController = new UserController(this);



























        mPendingIntentController = new PendingIntentController(













                mHandlerThread.getLooper(), mUserController);



























        GL_ES_VERSION = SystemProperties.getInt("ro.opengles.version",















            ConfigurationInfo.GL_ES_VERSION_UNDEFINED);























@@ -2412,9 +2415,6 @@ public class ActivityManagerService extends IActivityManager.Stub













        mAtmInternal = LocalServices.getService(ActivityTaskManagerInternal.class);















        mStackSupervisor = mActivityTaskManager.mStackSupervisor;



























        mPendingIntentController = new PendingIntentController(













                mHandlerThread.getLooper(), mUserController);



























        mProcessCpuThread = new Thread("CpuTracker") {















            @Override















            public void run() {