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

Merge "Remove unnecessary check and prevent unnecessary log" into tm-dev

Browse Source
This commit is contained in:
Louis Chang
2022-03-22 07:46:25 +00:00
committed by Android (Google) Code Review
parent 36ad81c452 e3719bdc6b
commit 8670fcdf21
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -2687,11 +2687,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);
}
}

2
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -2754,7 +2754,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
// 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;
}
}