Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e462b2dc authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia90e7e6b4f1a6e3aadd1fce2c6e2661a0dac126e
parents da1f0132 8bea4374

services/core/java/com/android/server/wm/ActivityStarter.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {