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

Commit 3dd65d92 authored by Robin Lee's avatar Robin Lee
Browse files

Clean up flag "contextual_search_prevent_self_capture" 

Fix: 410533482
Test: atest ContextualSearchManagerTest
Flag: EXEMPT flag cleanup
Change-Id: I2559c53d3057b74a96d76ce5723e0c5e3f2de8fc
parent 6d649293

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"

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

+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,