summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Luca Zuccarini <acul@google.com> 2024-01-29 09:35:10 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-01-29 09:35:10 +0000
commit8bbff97a70071305df2cb7f7083e2b4c86733b74 (patch)
tree09d52fb573c9f7cc4e8a056e784afbfc7254c38f
parent3c521f2e29ef950cee9e51f569293fc25db4d948 (diff)
parentfb5f0294820cc1a6606718ff508d7bbd21c2d29f (diff)
Merge "Don't give up on the launch animation if there is no task info." into main
-rw-r--r--packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt
index 9c46ebdc5ac8..81940553b127 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt
+++ b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt
@@ -644,7 +644,7 @@ class ActivityLaunchAnimator(
var candidate: RemoteAnimationTarget? = null
for (it in apps) {
if (it.mode == RemoteAnimationTarget.MODE_OPENING) {
- if (it.taskInfo != null && !it.hasAnimatingParent) {
+ if (!it.hasAnimatingParent) {
return it
}
if (candidate == null) {