Merge "Fix NPE in overview action buttons" into main (927c78f2) · Commits · e / os / android_packages_apps_Trebuchet

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

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