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

Commit ab2dc1d0 authored by Melody Hsu's avatar Melody Hsu
Browse files

Remove useIdentityTransform from DisplayCaptureArgs. 

Screenshots do not set useIdentityTransfrom to true with
a rotated display. The default value is false in
SurfaceFlinger and is not relevant for captureLayers,
which is the API that will be used for screenshots going
forward.

Bug: 293445881
Test: presubmit
Change-Id: I57ad5addcc8209b1f2f2b25b475bf11040c4327d
parent db9ea13d

core/java/android/window/ScreenCapture.java

+0 −14
Original line number Diff line number Diff line
@@ -528,14 +528,12 @@ public class ScreenCapture { 
        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;

        }



        /**
@@ -545,7 +543,6 @@ public class ScreenCapture { 
            private IBinder mDisplayToken;

            private int mWidth;

            private int mHeight;

            private boolean mUseIdentityTransform;



            /**

             * Construct a new {@link LayerCaptureArgs} with the set parameters. The builder
@@ -586,17 +583,6 @@ public class ScreenCapture { 
                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;

core/jni/android_window_ScreenCapture.cpp

+0 −6
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ static struct { 
    jfieldID displayToken;

    jfieldID width;

    jfieldID height;

    jfieldID useIdentityTransform;

} gDisplayCaptureArgsClassInfo;



static struct {
@@ -194,9 +193,6 @@ static DisplayCaptureArgs displayCaptureArgsFromObject(JNIEnv* env, 
            env->GetIntField(displayCaptureArgsObject, gDisplayCaptureArgsClassInfo.width);

    captureArgs.height =

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

    captureArgs.useIdentityTransform =

            env->GetBooleanField(displayCaptureArgsObject,

                                 gDisplayCaptureArgsClassInfo.useIdentityTransform);

    return captureArgs;

}
@@ -325,8 +321,6 @@ int register_android_window_ScreenCapture(JNIEnv* env) { 
            GetFieldIDOrDie(env, displayCaptureArgsClazz, "mWidth", "I");

    gDisplayCaptureArgsClassInfo.height =

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

    gDisplayCaptureArgsClassInfo.useIdentityTransform =

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



    jclass layerCaptureArgsClazz =

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