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

Commit fb3423a2 authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045438

Change-Id: I270b189c9af7b19fc2cd5f46ffe2dac5639bf348
parents e500d4a6 61869494

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;