commit fbc8b715c335710fce658e78337ee931a7bdee97
author Tracy Zhou <tracyzhou@google.com> Tue Oct 24 04:26:35 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 24 04:26:35 2023 +0000
tree 214c5042978565ec230d9368de471535560d3ace
parent 4d95f79db5ab6877a3c83ec0f77ee5da9e9b2266
parent 7cf1884d9202e643d7e76367bdefc90d3f110895

Merge "Null check on RecentsView for endLiveTile" into main

quickstep/src/com/android/quickstep/TaskOverlayFactory.java

diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index 7d03d77..cf74b7d 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -190,9 +190,11 @@
          */
         public void endLiveTileMode(@NonNull Runnable callback) {
             RecentsView recentsView = mThumbnailView.getTaskView().getRecentsView();
-            recentsView.switchToScreenshot(
-                    () -> recentsView.finishRecentsAnimation(true /* toRecents */,
-                            false /* shouldPip */, callback));
+            if (recentsView != null) {
+                recentsView.switchToScreenshot(
+                        () -> recentsView.finishRecentsAnimation(true /* toRecents */,
+                                false /* shouldPip */, callback));
+            }
         }
 
         /**