From e3719bdc6b5cb316735ae0e5caee9ea964ebe65d Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Tue, 22 Mar 2022 11:46:57 +0800 Subject: [PATCH] Remove unnecessary check and prevent unnecessary log .. while getting a valid root task. Bug: 184806710 Test: wm presubmit Change-Id: I8d6a0f5f928dffec4f2371988c5807aad370289b --- .../core/java/com/android/server/wm/ActivityStarter.java | 7 ++----- .../java/com/android/server/wm/RootWindowContainer.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 77ec67f31d508..1ab8fc937e062 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -2686,11 +2686,8 @@ class ActivityStarter { // launched into the same root task. mTargetRootTask = Task.fromWindowContainerToken(mSourceRecord.mLaunchRootTask); } else { - final Task rootTask = - getOrCreateRootTask(mStartActivity, mLaunchFlags, intentTask, mOptions); - // TODO(b/184806710): #getOrCreateRootTask should never return null? - mTargetRootTask = - rootTask != null ? rootTask : intentActivity.getRootTask(); + mTargetRootTask = getOrCreateRootTask(mStartActivity, mLaunchFlags, intentTask, + mOptions); } } diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 94fc51dc94d24..cc99f377bfeed 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -2754,7 +2754,7 @@ class RootWindowContainer extends WindowContainer // First preference goes to the launch root task set in the activity options. if (options != null) { final Task candidateRoot = Task.fromWindowContainerToken(options.getLaunchRootTask()); - if (canLaunchOnDisplay(r, candidateRoot)) { + if (candidateRoot != null && canLaunchOnDisplay(r, candidateRoot)) { return candidateRoot; } }