commit ccff1b84ea2c8dbaf354cc6d083769157131f3b2
author Johannes Gallmann <gallmann@google.com> Thu Dec 21 08:04:42 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 21 08:04:42 2023 +0000
tree 392bb26859c488f5c17e705f52f4a22f61c9c232
parent 227d3b79f34c96ebfa28bbc4bb5fdddec877867a
parent 87e2c868295edcdd791eaa5ec67eb01ca578a246

Merge "Fix NullPointerException in LauncherBackAnimationController" into main

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 7c24ba8..1feed0b 100644
--- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
+++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
@@ -287,7 +287,7 @@
         mBackInProgress = true;
         RemoteAnimationTarget appTarget = backEvent.getDepartingAnimationTarget();
 
-        if (appTarget == null) {
+        if (appTarget == null || appTarget.leash == null || !appTarget.leash.isValid()) {
             return;
         }