Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a028cd11 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias
Browse files

Fix NPE in overview action buttons

Flag: N/A
Fixes: 305894735
Test: pressed screenshot overview action button shortly before/after dismissing the current task
Change-Id: Ife93fa9af5416af60cf8ae24275f14bd6857901a
parent fbc8b715
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -190,12 +190,12 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
         */
        public void endLiveTileMode(@NonNull Runnable callback) {
            RecentsView recentsView = mThumbnailView.getTaskView().getRecentsView();
            if (recentsView != null) {
            // Task has already been dismissed
            if (recentsView == null) return;
            recentsView.switchToScreenshot(
                    () -> recentsView.finishRecentsAnimation(true /* toRecents */,
                            false /* shouldPip */, callback));
        }
        }

        /**
         * Called to save screenshot of the task thumbnail.
@@ -212,6 +212,8 @@ public class TaskOverlayFactory implements ResourceBasedOverride {

        private void enterSplitSelect() {
            RecentsView overviewPanel = mThumbnailView.getTaskView().getRecentsView();
            // Task has already been dismissed
            if (overviewPanel == null) return;
            overviewPanel.initiateSplitSelect(mThumbnailView.getTaskView());
        }

+1 −0
Original line number Diff line number Diff line
@@ -1677,6 +1677,7 @@ public class TaskView extends FrameLayout implements Reusable {
        return super.performAccessibilityAction(action, arguments);
    }

    @Nullable
    public RecentsView getRecentsView() {
        return (RecentsView) getParent();
    }