summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Gustav Sennton <gsennton@google.com> 2024-11-06 13:41:48 +0000
committer Gustav Sennton <gsennton@google.com> 2024-11-06 13:42:58 +0000
commit8badf561d62f1801039bbce6d24557940f96b84c (patch)
treed895112510362bb4f15875accccb26fc4227b7d7
parentb00c0520294720507484d26f93803b50dbc850a9 (diff)
Fix Desktop exit-transition code NPE
Test: NA Bug: 377665790 Flag: com.android.window.flags.enable_desktop_windowing_exit_transitions Change-Id: Ia54fa1d85bafefda9130725b91710b5363c0db2f
-rw-r--r--packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java b/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java
index 0b15d230dee2..cbe11a3f2f60 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java
+++ b/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java
@@ -268,7 +268,8 @@ public abstract class RemoteAnimationRunnerCompat extends IRemoteAnimationRunner
// skip changes that we didn't wrap
if (!leashMap.containsKey(change.getLeash())) continue;
// Only make the update if we are closing Desktop tasks.
- if (change.getTaskInfo().isFreeform() && isClosingMode(change.getMode())) {
+ if (change.getTaskInfo() != null && change.getTaskInfo().isFreeform()
+ && isClosingMode(change.getMode())) {
startTransaction.setAlpha(leashMap.get(launcherChange.getLeash()), 0f);
return;
}