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

Commit 53dc7eac authored by Craig Mautner's avatar Craig Mautner
Browse files

Add null check to cleanupRecentTasksLocked. 

If during boot, the package manager broadcast occurs before
TaskPersister has restored the recents list then mRecentTasks will be
null and an NPE will occur. This checks for null mRecentsTasks and
returns before the NPE happens.

Fixes bug 17300409.

Change-Id: I1588ad3a3c0d04bc6f273630ef5dadf6821e5710
parent eee0ea20

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

+5 −0
Original line number Diff line number Diff line
@@ -3816,6 +3816,11 @@ public final class ActivityManagerService extends ActivityManagerNative 
     * of affiliations.

     */

    void cleanupRecentTasksLocked(int userId) {

        if (mRecentTasks == null) {

            // Happens when called from the packagemanager broadcast before boot.

            return;

        }















        final HashMap<ComponentName, ActivityInfo> availActCache = new HashMap<>();















        final HashMap<String, ApplicationInfo> availAppCache = new HashMap<>();















        final IPackageManager pm = AppGlobals.getPackageManager();