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

Commit 583609d0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename "capture own screenshot" flag again" into main

parents e9d20449 49508c63

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ flag { 
}



flag {

    name: "contextual_search_window_layer"

    name: "contextual_search_prevent_self_capture"

    namespace: "sysui_integrations"

    description: "Identify live contextual search UI to exclude from contextual search screenshot."

    bug: "390176823"

services/contextualsearch/java/com/android/server/contextualsearch/ContextualSearchManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ public class ContextualSearchManagerService extends SystemService { 
            }

        }

        final ScreenshotHardwareBuffer shb = mWmInternal.takeContextualSearchScreenshot(

                (Flags.contextualSearchWindowLayer() ? csUid : -1));

                (Flags.contextualSearchPreventSelfCapture() ? csUid : -1));

        final Bitmap bm = shb != null ? shb.asBitmap() : null;

        // Now that everything is fetched, putting it in the launchIntent.

        if (bm != null) {
@@ -549,7 +549,7 @@ public class ContextualSearchManagerService extends SystemService { 
                Binder.withCleanCallingIdentity(() -> {

                    final ScreenshotHardwareBuffer shb =

                            mWmInternal.takeContextualSearchScreenshot(

                               (Flags.contextualSearchWindowLayer() ? callingUid : -1));

                               (Flags.contextualSearchPreventSelfCapture() ? callingUid : -1));

                    final Bitmap bm = shb != null ? shb.asBitmap() : null;

                    if (bm != null) {

                        bundle.putParcelable(ContextualSearchManager.EXTRA_SCREENSHOT,