Set options for activity being brought to front.
In the case where the activity is brought to the front instead of
creating a new activity, set the options for that ActivityRecord.
Fixes: 74793215
Test: Open app and see animation. Press home. Open same app again.
Animation works.
Change-Id: I1b8505d3db6f7de23b37e433b9ec9727b01444e5
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index d5a97d9..1190a49 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -4604,7 +4604,7 @@
}
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