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

Commit e9cce93c authored by chaviw's avatar chaviw Committed by android-build-merger
Browse files

Merge "Set options for activity being brought to front." into pi-dev am: 6468fd4b 

am: c4ba7b1a

Change-Id: I992eb4b4eca959ed083ac361545bf4421b7423fd
parents 1dd677fd c4ba7b1a

services/core/java/com/android/server/am/ActivityStack.java

+1 −1
Original line number Diff line number Diff line
@@ -4590,7 +4590,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
            }

            ActivityOptions.abort(options);

        } else {

            updateTransitLocked(TRANSIT_TASK_TO_FRONT, starting, options);

            updateTransitLocked(TRANSIT_TASK_TO_FRONT, r, options);

        }

        // If a new task is moved to the front, then mark the existing top activity as supporting

        // picture-in-picture while paused only if the task would not be considered an oerlay on top