From 85018d5393262659862c6cd36a37dda585160d11 Mon Sep 17 00:00:00 2001 From: "charlesccchen@google.com" Date: Wed, 2 Mar 2022 09:16:22 +0000 Subject: [PATCH] Fix NPE in RunningTasks#getTasks Test: presubmit Bug: 220166475 Change-Id: If2d049addb67f7582c1837fb823b21dcafcd9608 --- services/core/java/com/android/server/wm/RunningTasks.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/RunningTasks.java b/services/core/java/com/android/server/wm/RunningTasks.java index d31b007c56afd..3d6d1825adc7d 100644 --- a/services/core/java/com/android/server/wm/RunningTasks.java +++ b/services/core/java/com/android/server/wm/RunningTasks.java @@ -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;