Merge "Clean up flag "contextual_search_prevent_self_capture"" into main (b6505cfd) · Commits · e / os / android_frameworks_base

core/java/android/app/contextualsearch/flags.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -34,17 +34,6 @@ flag {
		}
		}


		flag {
		name: "contextual_search_prevent_self_capture"
		namespace: "sysui_integrations"
		description: "Identify live contextual search UI to exclude from contextual search screenshot."
		bug: "390176823"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "contextual_search_media_projection"
		namespace: "sysui_integrations"

+2 −4

Original line number	Diff line number	Diff line
		@@ -372,8 +372,7 @@ public class ContextualSearchManagerService extends SystemService {
		Log.e(TAG, "Could not request assist data", e);
		}
		}
		final ScreenshotHardwareBuffer shb = mWmInternal.takeContextualSearchScreenshot(
		(Flags.contextualSearchPreventSelfCapture() ? csUid : -1));
		final ScreenshotHardwareBuffer shb = mWmInternal.takeContextualSearchScreenshot(csUid);
		final Bitmap bm = shb != null ? shb.asBitmap() : null;
		// Now that everything is fetched, putting it in the launchIntent.
		if (bm != null) {
		@@ -586,8 +585,7 @@ public class ContextualSearchManagerService extends SystemService {
		getContextualSearchPackageName());
		Binder.withCleanCallingIdentity(() -> {
		final ScreenshotHardwareBuffer shb =
		mWmInternal.takeContextualSearchScreenshot(
		(Flags.contextualSearchPreventSelfCapture() ? callingUid : -1));
		mWmInternal.takeContextualSearchScreenshot(callingUid);
		final Bitmap bm = shb != null ? shb.asBitmap() : null;
		if (bm != null) {
		bundle.putParcelable(ContextualSearchManager.EXTRA_SCREENSHOT,