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

Commit a9abe035 authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "Remove sync_screen_capture flag" into main

parents ceba9d1e 31e7fc3c

core/java/android/window/ScreenCaptureInternal.java

+1 −3
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ import android.window.ScreenCapture.ScreenCaptureParams.CaptureMode; 
import android.window.ScreenCapture.ScreenCaptureParams.ProtectedContentPolicy;

import android.window.ScreenCapture.ScreenCaptureParams.SecureContentPolicy;



import com.android.window.flags.Flags;



import libcore.util.NativeAllocationRegistry;



import java.util.concurrent.CountDownLatch;
@@ -160,7 +158,7 @@ public class ScreenCaptureInternal { 
    public static ScreenshotHardwareBuffer captureLayers(LayerCaptureArgs captureArgs) {

        SynchronousScreenCaptureListener syncScreenCapture = createSyncCaptureListener();

        int status = nativeCaptureLayers(captureArgs, syncScreenCapture.mNativeObject,

                Flags.syncScreenCapture());

                /* sync */ true);

        if (status != 0) {

            return null;

        }

core/java/android/window/flags/window_surfaces.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -39,14 +39,6 @@ flag { 
    bug: "304574518"

}



flag {

    namespace: "window_surfaces"

    name: "sync_screen_capture"

    description: "Create a screen capture API that blocks in SurfaceFlinger"

    is_fixed_read_only: true

    bug: "321263247"

}



flag {

    namespace: "window_surfaces"

    name: "set_sc_properties_in_client"