Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Charles Chen
2022-03-03 02:43:08 +00:00
committed by Android (Google) Code Review
parent 8a2da670b6 85018d5393
commit 6186949467
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/RunningTasks.java
View File

@@ -82,7 +82,8 @@ class RunningTasks {
mRecentTasks = root.mService.getRecentTasks(); mRecentTasks = root.mService.getRecentTasks();
mKeepIntentExtra = (flags & FLAG_KEEP_INTENT_EXTRA) == FLAG_KEEP_INTENT_EXTRA; mKeepIntentExtra = (flags & FLAG_KEEP_INTENT_EXTRA) == FLAG_KEEP_INTENT_EXTRA;
if (mTopDisplayFocusRootTask.getAdjacentTaskFragment() != null) { if (mTopDisplayFocusRootTask != null
&& mTopDisplayFocusRootTask.getAdjacentTaskFragment() != null) {
mTopDisplayAdjacentTask = mTopDisplayFocusRootTask.getAdjacentTaskFragment().asTask(); mTopDisplayAdjacentTask = mTopDisplayFocusRootTask.getAdjacentTaskFragment().asTask();
} else { } else {
mTopDisplayAdjacentTask = null; mTopDisplayAdjacentTask = null;