commit a82403ab09350211fc3703d3874aedc1fa280012
author Winson Chung <winsonc@google.com> Sat Jul 03 03:26:26 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 03 03:26:26 2021 +0000
tree 31e97df90c63b1baebfee4dd827444fb8776ecc7
parent e67baf65f2d38925d7e1c442e316111e7f459606
parent 553d9780122d1f905180527772a1da8c97db357e

Merge "Fix crash when handling recents animation canceled" into sc-dev

quickstep/src/com/android/quickstep/GestureState.java

diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java
index 015002f..e3ae361 100644
--- a/quickstep/src/com/android/quickstep/GestureState.java
+++ b/quickstep/src/com/android/quickstep/GestureState.java
@@ -364,7 +364,9 @@
         mStateCallback.setState(STATE_RECENTS_ANIMATION_ENDED);
         if (mRecentsAnimationCanceledSnapshot != null) {
             // Clean up the screenshot to finalize the recents animation cancel
-            mRecentsAnimationController.cleanupScreenshot();
+            if (mRecentsAnimationController != null) {
+                mRecentsAnimationController.cleanupScreenshot();
+            }
             mRecentsAnimationCanceledSnapshot = null;
         }
     }