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

Commit 8c464b95 authored by Melody Hsu's avatar Melody Hsu
Browse files

Revert "Delete ScreenCapture#captureDisplay and DisplayCaptureArgs." 

This reverts commit 8b04d81f.

Bug: b/301083608
Reason for revert: investigating causes for b/301083608

Change-Id: I24e0387ccd360c22dee7e4a3e35057c986d4fd2b
parent d62f9452

core/java/android/window/ScreenCapture.java

+124 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.PixelFormat; 
import android.graphics.Rect;

import android.graphics.Rect;

import android.hardware.HardwareBuffer;

import android.hardware.HardwareBuffer;

import android.os.Build;

import android.os.Build;

import android.os.IBinder;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.util.Log;

import android.util.Log;
@@ -34,6 +35,7 @@ import libcore.util.NativeAllocationRegistry; 
import java.util.concurrent.CountDownLatch;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeUnit;

import java.util.function.ObjIntConsumer;

import java.util.function.ObjIntConsumer;



/**

/**

 * Handles display and layer captures for the system.

 * Handles display and layer captures for the system.

 *

 *
@@ -43,6 +45,8 @@ public class ScreenCapture { 
    private static final String TAG = "ScreenCapture";

    private static final String TAG = "ScreenCapture";

    private static final int SCREENSHOT_WAIT_TIME_S = 4 * Build.HW_TIMEOUT_MULTIPLIER;

    private static final int SCREENSHOT_WAIT_TIME_S = 4 * Build.HW_TIMEOUT_MULTIPLIER;





    private static native int nativeCaptureDisplay(DisplayCaptureArgs captureArgs,

            long captureListener);

    private static native int nativeCaptureLayers(LayerCaptureArgs captureArgs,

    private static native int nativeCaptureLayers(LayerCaptureArgs captureArgs,

            long captureListener);

            long captureListener);

    private static native long nativeCreateScreenCaptureListener(

    private static native long nativeCreateScreenCaptureListener(
@@ -51,6 +55,37 @@ public class ScreenCapture { 
    private static native long nativeReadListenerFromParcel(Parcel in);

    private static native long nativeReadListenerFromParcel(Parcel in);

    private static native long getNativeListenerFinalizer();

    private static native long getNativeListenerFinalizer();





    /**

     * @param captureArgs     Arguments about how to take the screenshot

     * @param captureListener A listener to receive the screenshot callback

     * @hide

     */

    public static int captureDisplay(@NonNull DisplayCaptureArgs captureArgs,

            @NonNull ScreenCaptureListener captureListener) {

        return nativeCaptureDisplay(captureArgs, captureListener.mNativeObject);

    }



    /**

     * Captures all the surfaces in a display and returns a {@link ScreenshotHardwareBuffer} with

     * the content.

     *

     * @hide

     */

    public static ScreenshotHardwareBuffer captureDisplay(

            DisplayCaptureArgs captureArgs) {

        SynchronousScreenCaptureListener syncScreenCapture = createSyncCaptureListener();

        int status = captureDisplay(captureArgs, syncScreenCapture);

        if (status != 0) {

            return null;

        }



        try {

            return syncScreenCapture.getBuffer();

        } catch (Exception e) {

            return null;

        }

    }



    /**

    /**

     * Captures a layer and its children and returns a {@link HardwareBuffer} with the content.

     * Captures a layer and its children and returns a {@link HardwareBuffer} with the content.

     *

     *
@@ -483,6 +518,92 @@ public class ScreenCapture { 
                };

                };

    }

    }





    /**

     * The arguments class used to make display capture requests.

     *

     * @hide

     * @see #nativeCaptureDisplay(DisplayCaptureArgs, long)

     */

    public static class DisplayCaptureArgs extends CaptureArgs {

        private final IBinder mDisplayToken;

        private final int mWidth;

        private final int mHeight;

        private final boolean mUseIdentityTransform;



        private DisplayCaptureArgs(Builder builder) {

            super(builder);

            mDisplayToken = builder.mDisplayToken;

            mWidth = builder.mWidth;

            mHeight = builder.mHeight;

            mUseIdentityTransform = builder.mUseIdentityTransform;

        }



        /**

         * The Builder class used to construct {@link DisplayCaptureArgs}

         */

        public static class Builder extends CaptureArgs.Builder<Builder> {

            private IBinder mDisplayToken;

            private int mWidth;

            private int mHeight;

            private boolean mUseIdentityTransform;



            /**

             * Construct a new {@link LayerCaptureArgs} with the set parameters. The builder

             * remains valid.

             */

            public DisplayCaptureArgs build() {

                if (mDisplayToken == null) {

                    throw new IllegalStateException(

                            "Can't take screenshot with null display token");

                }

                return new DisplayCaptureArgs(this);

            }



            public Builder(IBinder displayToken) {

                setDisplayToken(displayToken);

            }



            /**

             * The display to take the screenshot of.

             */

            public Builder setDisplayToken(IBinder displayToken) {

                mDisplayToken = displayToken;

                return this;

            }



            /**

             * Set the desired size of the returned buffer. The raw screen  will be  scaled down to

             * this size

             *

             * @param width  The desired width of the returned buffer. Caller may pass in 0 if no

             *               scaling is desired.

             * @param height The desired height of the returned buffer. Caller may pass in 0 if no

             *               scaling is desired.

             */

            public Builder setSize(int width, int height) {

                mWidth = width;

                mHeight = height;

                return this;

            }



            /**

             * Replace the rotation transform of the display with the identity transformation while

             * taking the screenshot. This ensures the screenshot is taken in the ROTATION_0

             * orientation. Set this value to false if the screenshot should be taken in the

             * current screen orientation.

             */

            public Builder setUseIdentityTransform(boolean useIdentityTransform) {

                mUseIdentityTransform = useIdentityTransform;

                return this;

            }



            @Override

            Builder getThis() {

                return this;

            }

        }

    }



    /**

    /**

     * The arguments class used to make layer capture requests.

     * The arguments class used to make layer capture requests.

     *

     *
@@ -561,6 +682,7 @@ public class ScreenCapture { 




    /**

    /**

     * The object used to receive the results when invoking screen capture requests via

     * The object used to receive the results when invoking screen capture requests via

     * {@link #captureDisplay(DisplayCaptureArgs, ScreenCaptureListener)} or

     * {@link #captureLayers(LayerCaptureArgs, ScreenCaptureListener)}

     * {@link #captureLayers(LayerCaptureArgs, ScreenCaptureListener)}

     *

     *

     * This listener can only be used for a single call to capture content call.

     * This listener can only be used for a single call to capture content call.
@@ -662,7 +784,8 @@ public class ScreenCapture { 




    /**

    /**

     * Helper class to synchronously get the {@link ScreenshotHardwareBuffer} when calling

     * Helper class to synchronously get the {@link ScreenshotHardwareBuffer} when calling

     * {@link #captureLayers(LayerCaptureArgs, ScreenCaptureListener)}

     * {@link #captureLayers(LayerCaptureArgs, ScreenCaptureListener)} or

     * {@link #captureDisplay(DisplayCaptureArgs, ScreenCaptureListener)}

     */

     */

    public abstract static class SynchronousScreenCaptureListener extends ScreenCaptureListener {

    public abstract static class SynchronousScreenCaptureListener extends ScreenCaptureListener {

        SynchronousScreenCaptureListener(ObjIntConsumer<ScreenshotHardwareBuffer> consumer) {

        SynchronousScreenCaptureListener(ObjIntConsumer<ScreenshotHardwareBuffer> consumer) {

core/jni/android_window_ScreenCapture.cpp

+53 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,13 @@ static struct { 
    jfieldID hintForSeamlessTransition;

    jfieldID hintForSeamlessTransition;

} gCaptureArgsClassInfo;

} gCaptureArgsClassInfo;





static struct {

    jfieldID displayToken;

    jfieldID width;

    jfieldID height;

    jfieldID useIdentityTransform;

} gDisplayCaptureArgsClassInfo;



static struct {

static struct {

    jfieldID layer;

    jfieldID layer;

    jfieldID childrenOnly;

    jfieldID childrenOnly;
@@ -174,6 +181,39 @@ static void getCaptureArgs(JNIEnv* env, jobject captureArgsObject, CaptureArgs& 
                                 gCaptureArgsClassInfo.hintForSeamlessTransition);

                                 gCaptureArgsClassInfo.hintForSeamlessTransition);

}

}





static DisplayCaptureArgs displayCaptureArgsFromObject(JNIEnv* env,

                                                       jobject displayCaptureArgsObject) {

    DisplayCaptureArgs captureArgs;

    getCaptureArgs(env, displayCaptureArgsObject, captureArgs);



    captureArgs.displayToken =

            ibinderForJavaObject(env,

                                 env->GetObjectField(displayCaptureArgsObject,

                                                     gDisplayCaptureArgsClassInfo.displayToken));

    captureArgs.width =

            env->GetIntField(displayCaptureArgsObject, gDisplayCaptureArgsClassInfo.width);

    captureArgs.height =

            env->GetIntField(displayCaptureArgsObject, gDisplayCaptureArgsClassInfo.height);

    captureArgs.useIdentityTransform =

            env->GetBooleanField(displayCaptureArgsObject,

                                 gDisplayCaptureArgsClassInfo.useIdentityTransform);

    return captureArgs;

}



static jint nativeCaptureDisplay(JNIEnv* env, jclass clazz, jobject displayCaptureArgsObject,

                                 jlong screenCaptureListenerObject) {

    const DisplayCaptureArgs captureArgs =

            displayCaptureArgsFromObject(env, displayCaptureArgsObject);



    if (captureArgs.displayToken == nullptr) {

        return BAD_VALUE;

    }



    sp<gui::IScreenCaptureListener> captureListener =

            reinterpret_cast<gui::IScreenCaptureListener*>(screenCaptureListenerObject);

    return ScreenshotClient::captureDisplay(captureArgs, captureListener);

}



static jint nativeCaptureLayers(JNIEnv* env, jclass clazz, jobject layerCaptureArgsObject,

static jint nativeCaptureLayers(JNIEnv* env, jclass clazz, jobject layerCaptureArgsObject,

                                jlong screenCaptureListenerObject) {

                                jlong screenCaptureListenerObject) {

    LayerCaptureArgs captureArgs;

    LayerCaptureArgs captureArgs;
@@ -243,6 +283,8 @@ static jlong getNativeListenerFinalizer(JNIEnv* env, jclass clazz) { 




static const JNINativeMethod sScreenCaptureMethods[] = {

static const JNINativeMethod sScreenCaptureMethods[] = {

        // clang-format off

        // clang-format off

    {"nativeCaptureDisplay", "(Landroid/window/ScreenCapture$DisplayCaptureArgs;J)I",

            (void*)nativeCaptureDisplay },

    {"nativeCaptureLayers",  "(Landroid/window/ScreenCapture$LayerCaptureArgs;J)I",

    {"nativeCaptureLayers",  "(Landroid/window/ScreenCapture$LayerCaptureArgs;J)I",

            (void*)nativeCaptureLayers },

            (void*)nativeCaptureLayers },

    {"nativeCreateScreenCaptureListener", "(Ljava/util/function/ObjIntConsumer;)J",

    {"nativeCreateScreenCaptureListener", "(Ljava/util/function/ObjIntConsumer;)J",
@@ -275,6 +317,17 @@ int register_android_window_ScreenCapture(JNIEnv* env) { 
    gCaptureArgsClassInfo.hintForSeamlessTransition =

    gCaptureArgsClassInfo.hintForSeamlessTransition =

            GetFieldIDOrDie(env, captureArgsClazz, "mHintForSeamlessTransition", "Z");

            GetFieldIDOrDie(env, captureArgsClazz, "mHintForSeamlessTransition", "Z");





    jclass displayCaptureArgsClazz =

            FindClassOrDie(env, "android/window/ScreenCapture$DisplayCaptureArgs");

    gDisplayCaptureArgsClassInfo.displayToken =

            GetFieldIDOrDie(env, displayCaptureArgsClazz, "mDisplayToken", "Landroid/os/IBinder;");

    gDisplayCaptureArgsClassInfo.width =

            GetFieldIDOrDie(env, displayCaptureArgsClazz, "mWidth", "I");

    gDisplayCaptureArgsClassInfo.height =

            GetFieldIDOrDie(env, displayCaptureArgsClazz, "mHeight", "I");

    gDisplayCaptureArgsClassInfo.useIdentityTransform =

            GetFieldIDOrDie(env, displayCaptureArgsClazz, "mUseIdentityTransform", "Z");



    jclass layerCaptureArgsClazz =

    jclass layerCaptureArgsClazz =

            FindClassOrDie(env, "android/window/ScreenCapture$LayerCaptureArgs");

            FindClassOrDie(env, "android/window/ScreenCapture$LayerCaptureArgs");

    gLayerCaptureArgsClassInfo.layer =

    gLayerCaptureArgsClassInfo.layer =