Merge "Make singleTop activity be created with different display" into sc-dev am: 8bea43740a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia90e7e6b4f1a6e3aadd1fce2c6e2661a0dac126e
This commit is contained in:
Jeff Chang
2021-02-26 02:06:09 +00:00
committed by Automerger Merge Worker

View File

@@ -1708,7 +1708,7 @@ class ActivityStarter {
// If the activity being launched is the same as the one currently at the top, then
// we need to check if it should only be launched once.
final Task topRootTask = mRootWindowContainer.getTopDisplayFocusedRootTask();
final Task topRootTask = mPreferredTaskDisplayArea.getFocusedRootTask();
if (topRootTask != null) {
startResult = deliverToCurrentTopIfNeeded(topRootTask, intentGrants);
if (startResult != START_SUCCESS) {