commit c53c009190b18832e9eb5d7efcc9c12c7a2dbe08
author Tracy Zhou <tracyzhou@google.com> Tue May 11 21:44:35 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 11 21:44:35 2021 +0000
tree 016fff41ac8be51fefa39ad294d5c64eca7ed127
parent d6ab63d34c4ea931672780b893bdaa98e8bae2e1
parent 5465527e16676d25774ec1b346dbb5db250e7eef

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

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

Change-Id: Iee746fa8d5eb50fb660f95b49c6678197f72578a

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);
     }