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

Commit 03cb7ba1 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Initialize PendingIntentController before ActivityTaskManagerService 

Because ATMS needs it to function.

Change-Id: I638f9c138c3281d40f09db34e9e39f602d6a1ad1
Fixes: 116826046
Test: Steps from bug
parent 429e1477

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() {