commit 87e2c868295edcdd791eaa5ec67eb01ca578a246
author Johannes Gallmann <gallmann@google.com> Wed Dec 20 15:03:04 2023 +0100
committer Johannes Gallmann <gallmann@google.com> Wed Dec 20 15:03:04 2023 +0100
tree de2f0c8090335bd8e5f41c8eedae9f72926275ca
parent 2adff1b7c01615d0bded76c02ebdb99f6e95237e

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

quickstep/src/com/android/quickstep/LauncherBackAnimationController.java

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