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

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

Merge "Clean up flag report_secure_surfaces_in_assist_structure" into main

parents bfef8d27 948e08b2

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

+0 −11
Original line number Diff line number Diff line
@@ -23,17 +23,6 @@ flag { 
    bug: "371065456"

}





flag {

  name: "report_secure_surfaces_in_assist_structure"

  namespace: "windowing_frontend"

  description: "SurfaceView reports when the surface is using a SECURE flag."

  bug: "390504528"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

    name: "contextual_search_media_projection"

    namespace: "sysui_integrations"

core/java/android/view/SurfaceView.java

+3 −5
Original line number Diff line number Diff line
@@ -2287,13 +2287,11 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
    protected void onProvideStructure(@NonNull ViewStructure structure,

            @ViewStructureType int viewFor, int flags) {

        super.onProvideStructure(structure, viewFor, flags);

        if (android.app.contextualsearch.flags.Flags.reportSecureSurfacesInAssistStructure()) {

        if ((mSurfaceFlags & SurfaceControl.SECURE) != 0) {

            structure.getExtras().putBoolean(

                    ViewStructure.EXTRA_CONTAINS_SECURE_LAYERS, true);

        }

    }

    }



    /** @hide */

    @Override