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 am: 6186949467

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

Change-Id: I533ffe6621f3c57a65c158ad49f76f9a79583ba8
This commit is contained in:
Charles Chen
2022-03-03 02:45:34 +00:00
committed by Automerger Merge Worker
parent d96f7549de 6186949467
commit e90e1090bb
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();
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;