commit 5465527e16676d25774ec1b346dbb5db250e7eef
author Tracy Zhou <tracyzhou@google.com> Tue May 11 20:44:17 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 11 20:44:17 2021 +0000
tree 676100356ba3b86e6687f824cf0133bbcaa3f313
parent a7cc2cbdb56be32939509ae76fd391ad9483bde8
parent 09aa748b7dbd59f0fb2daaae6492ca3df815e711

Merge "Check if mRecentsAnimationController is null before switching to screenshot" into sc-dev

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