commit c378347e4df8c0c1244439e51ca039ba04f6b338
author Tracy Zhou <tracyzhou@google.com> Tue May 11 22:05:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 11 22:05:28 2021 +0000
tree 016fff41ac8be51fefa39ad294d5c64eca7ed127
parent 5ff69fee9f4ef89e5462c4300322c0cbfc3895b4
parent 7c4ad155fc0196d45a68e5e22a8881833a92284a

Merge "Check if mRecentsAnimationController is null before switching to screenshot" into sc-dev am: 5465527e16 am: 7c4ad155fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14490316

Change-Id: Ie6c639fe0e0908afb76653b484ee337ccc8d6247

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 5a58a82..4800596 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3635,6 +3635,12 @@
      * capturing the snapshot at the same time.
      */
     public void switchToScreenshot(Runnable onFinishRunnable) {
+        if (mRecentsAnimationController == null) {
+            if (onFinishRunnable != null) {
+                onFinishRunnable.run();
+            }
+            return;
+        }
         switchToScreenshot(mRunningTaskId == -1 ? null
                 : mRecentsAnimationController.screenshotTask(mRunningTaskId), onFinishRunnable);
     }