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

Commit 61869494 authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in RunningTasks#getTasks" into tm-dev

parents 8a2da670 85018d53

services/core/java/com/android/server/wm/RunningTasks.java

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ class RunningTasks { 
        mRecentTasks = root.mService.getRecentTasks();

        mKeepIntentExtra = (flags & FLAG_KEEP_INTENT_EXTRA) == FLAG_KEEP_INTENT_EXTRA;



        if (mTopDisplayFocusRootTask.getAdjacentTaskFragment() != null) {

        if (mTopDisplayFocusRootTask != null

                && mTopDisplayFocusRootTask.getAdjacentTaskFragment() != null) {

            mTopDisplayAdjacentTask = mTopDisplayFocusRootTask.getAdjacentTaskFragment().asTask();

        } else {

            mTopDisplayAdjacentTask = null;