Merge "Call back ScreenshotActionsProvider with null content if none is available." into main (7e24e989) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/screenshot/AssistContentRequester.java

+5 −10

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/

		package com.android.systemui.screenshot;
		import android.annotation.Nullable;
		import android.app.ActivityTaskManager;
		import android.app.IActivityTaskManager;
		import android.app.IAssistDataReceiver;
		@@ -55,7 +56,7 @@ public class AssistContentRequester {
		* Called when the {@link android.app.assist.AssistContent} of the requested task is
		* available.
		**/
		void onAssistContentAvailable(AssistContent assistContent);
		void onAssistContentAvailable(@Nullable AssistContent assistContent);
		}

		private final IActivityTaskManager mActivityTaskManager;
		@@ -117,15 +118,9 @@ public class AssistContentRequester {

		@Override
		public void onHandleAssistData(Bundle data) {
		if (data == null) {
		return;
		}

		final AssistContent content = data.getParcelable(ASSIST_KEY_CONTENT);
		if (content == null) {
		Log.e(TAG, "Received AssistData, but no AssistContent found");
		return;
		}
		final AssistContent content = (data == null) ? null
		: data.getParcelable(
		ASSIST_KEY_CONTENT, AssistContent.class);

		AssistContentRequester requester = mParentRef.get();
		if (requester != null) {

+5 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,11 @@ interface ScreenshotActionsProvider {
		fun onScrollChipReady(onClick: Runnable)
		fun setCompletedScreenshot(result: ScreenshotSavedResult)

		fun onAssistContentAvailable(assistContent: AssistContent) {}
		/**
		* Provide the AssistContent for the focused task if available, null if the focused task isn't
		* known or didn't return data.
		*/
		fun onAssistContent(assistContent: AssistContent?) {}

		interface Factory {
		fun create(

+3 −3

Original line number	Diff line number	Diff line
		@@ -412,9 +412,9 @@ public class ScreenshotController {

		if (screenshot.getTaskId() >= 0) {
		mAssistContentRequester.requestAssistContent(screenshot.getTaskId(),
		assistContent -> {
		mActionsProvider.onAssistContentAvailable(assistContent);
		});
		assistContent -> mActionsProvider.onAssistContent(assistContent));
		} else {
		mActionsProvider.onAssistContent(null);
		}
		} else {
		saveScreenshotInWorkerThread(screenshot.getUserHandle(), finisher,