From 87e2c868295edcdd791eaa5ec67eb01ca578a246 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@google.com>
Date: Wed, 20 Dec 2023 15:03:04 +0100
Subject: [PATCH] Fix NullPointerException in LauncherBackAnimationController

Bug: 316663312
Flag: NONE
Test: Manual, i.e. verifying that this change does not introduce any unexpected regressions
Change-Id: I749f3944d5fd71e525ce31ff720dd86f1a84277e
---
 .../com/android/quickstep/LauncherBackAnimationController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
index 9e58160271..406ba28b9c 100644
--- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
+++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
@@ -284,7 +284,7 @@ public class LauncherBackAnimationController {
         mBackInProgress = true;
         RemoteAnimationTarget appTarget = backEvent.getDepartingAnimationTarget();
 
-        if (appTarget == null) {
+        if (appTarget == null || appTarget.leash == null || !appTarget.leash.isValid()) {
             return;
         }