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

Commit a69e0a7d authored by chaviw's avatar chaviw
Browse files

Update screenshot requests to render proper crop and rotation. 

The previous screenshot requests in SystemUI would generate a bitmap
and then adjust crop and rotation afterwards. Bitmaps from screenshots
are now hw Bitmaps so they can't be updated in software. Instead request
the proper crop and rotation from the native code to generate a Bitmap
with the correct configurations.

Change-Id: I4591c468b055c784460e5ddf2f9163ffa943c2ee
Fixes: 69898957
Test: Manual screenshots work and bugreport screenshots work in landscape.
parent d7ec64cc

core/java/android/app/IUiAutomationConnection.aidl

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app; 


import android.accessibilityservice.IAccessibilityServiceClient;

import android.graphics.Bitmap;

import android.graphics.Rect;

import android.view.InputEvent;

import android.view.WindowContentFrameStats;

import android.view.WindowAnimationFrameStats;
@@ -37,7 +38,7 @@ interface IUiAutomationConnection { 
    void disconnect();

    boolean injectInputEvent(in InputEvent event, boolean sync);

    boolean setRotation(int rotation);

    Bitmap takeScreenshot(int width, int height);

    Bitmap takeScreenshot(in Rect crop, int rotation);

    boolean clearWindowContentFrameStats(int windowId);

    WindowContentFrameStats getWindowContentFrameStats(int windowId);

    void clearWindowAnimationFrameStats();

core/java/android/app/UiAutomation.java

+4 −45
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.annotation.TestApi; 
import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.Region;

import android.hardware.display.DisplayManagerGlobal;

import android.os.IBinder;
@@ -690,42 +691,15 @@ public final class UiAutomation { 
                .getRealDisplay(Display.DEFAULT_DISPLAY);

        Point displaySize = new Point();

        display.getRealSize(displaySize);

        final int displayWidth = displaySize.x;

        final int displayHeight = displaySize.y;



        final float screenshotWidth;

        final float screenshotHeight;



        final int rotation = display.getRotation();

        switch (rotation) {

            case ROTATION_FREEZE_0: {

                screenshotWidth = displayWidth;

                screenshotHeight = displayHeight;

            } break;

            case ROTATION_FREEZE_90: {

                screenshotWidth = displayHeight;

                screenshotHeight = displayWidth;

            } break;

            case ROTATION_FREEZE_180: {

                screenshotWidth = displayWidth;

                screenshotHeight = displayHeight;

            } break;

            case ROTATION_FREEZE_270: {

                screenshotWidth = displayHeight;

                screenshotHeight = displayWidth;

            } break;

            default: {

                throw new IllegalArgumentException("Invalid rotation: "

                        + rotation);

            }

        }

        int rotation = display.getRotation();



        // Take the screenshot

        Bitmap screenShot = null;

        try {

            // Calling out without a lock held.

            screenShot = mUiAutomationConnection.takeScreenshot((int) screenshotWidth,

                    (int) screenshotHeight);

            screenShot = mUiAutomationConnection.takeScreenshot(

                    new Rect(0, 0, displaySize.x, displaySize.y), rotation);

            if (screenShot == null) {

                return null;

            }
@@ -734,21 +708,6 @@ public final class UiAutomation { 
            return null;

        }



        // Rotate the screenshot to the current orientation

        if (rotation != ROTATION_FREEZE_0) {

            Bitmap unrotatedScreenShot = Bitmap.createBitmap(displayWidth, displayHeight,

                    Bitmap.Config.ARGB_8888);

            Canvas canvas = new Canvas(unrotatedScreenShot);

            canvas.translate(unrotatedScreenShot.getWidth() / 2,

                    unrotatedScreenShot.getHeight() / 2);

            canvas.rotate(getDegreesForRotation(rotation));

            canvas.translate(- screenshotWidth / 2, - screenshotHeight / 2);

            canvas.drawBitmap(screenShot, 0, 0, null);

            canvas.setBitmap(null);

            screenShot.recycle();

            screenShot = unrotatedScreenShot;

        }



        // Optimization

        screenShot.setHasAlpha(false);

core/java/android/app/UiAutomationConnection.java

+5 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.accessibilityservice.IAccessibilityServiceClient; 
import android.content.Context;

import android.content.pm.IPackageManager;

import android.graphics.Bitmap;

import android.graphics.Rect;

import android.hardware.input.InputManager;

import android.os.Binder;

import android.os.IBinder;
@@ -153,7 +154,7 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { 
    }



    @Override

    public Bitmap takeScreenshot(int width, int height) {

    public Bitmap takeScreenshot(Rect crop, int rotation) {

        synchronized (mLock) {

            throwIfCalledByNotTrustedUidLocked();

            throwIfShutdownLocked();
@@ -161,7 +162,9 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { 
        }

        final long identity = Binder.clearCallingIdentity();

        try {

            return SurfaceControl.screenshot(width, height);

            int width = crop.width();

            int height = crop.height();

            return SurfaceControl.screenshot(crop, width, height, rotation);

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

core/java/android/view/SurfaceControl.java

+31 −4
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package android.view;



import static android.view.Surface.ROTATION_270;

import static android.view.Surface.ROTATION_90;



import android.annotation.Size;

import android.graphics.Bitmap;

import android.graphics.GraphicBuffer;
@@ -1142,22 +1145,35 @@ public class SurfaceControl { 


    /**

     * Like {@link SurfaceControl#screenshot(int, int, int, int, boolean)} but

     * includes all Surfaces in the screenshot.

     * includes all Surfaces in the screenshot. This will also update the orientation so it

     * sends the correct coordinates to SF based on the rotation value.

     *

     * @param sourceCrop The portion of the screen to capture into the Bitmap;

     * caller may pass in 'new Rect()' if no cropping is desired.

     * @param width The desired width of the returned bitmap; the raw

     * screen will be scaled down to this size.

     * @param height The desired height of the returned bitmap; the raw

     * screen will be scaled down to this size.

     * @param rotation Apply a custom clockwise rotation to the screenshot, i.e.

     * Surface.ROTATION_0,90,180,270. Surfaceflinger will always take

     * screenshots in its native portrait orientation by default, so this is

     * useful for returning screenshots that are independent of device

     * orientation.

     * @return Returns a Bitmap containing the screen contents, or null

     * if an error occurs. Make sure to call Bitmap.recycle() as soon as

     * possible, once its content is not needed anymore.

     */

    public static Bitmap screenshot(int width, int height) {

    public static Bitmap screenshot(Rect sourceCrop, int width, int height, int rotation) {

        // TODO: should take the display as a parameter

        IBinder displayToken = SurfaceControl.getBuiltInDisplay(

                SurfaceControl.BUILT_IN_DISPLAY_ID_MAIN);

        return nativeScreenshot(displayToken, new Rect(), width, height, 0, 0, true,

                false, Surface.ROTATION_0);

        if (rotation == ROTATION_90 || rotation == ROTATION_270) {

            rotation = (rotation == ROTATION_90) ? ROTATION_270 : ROTATION_90;

        }



        SurfaceControl.rotateCropForSF(sourceCrop, rotation);

        return nativeScreenshot(displayToken, sourceCrop, width, height, 0, 0, true,

                false, rotation);

    }



    private static void screenshot(IBinder display, Surface consumer, Rect sourceCrop,
@@ -1173,6 +1189,17 @@ public class SurfaceControl { 
                minLayer, maxLayer, allLayers, useIdentityTransform);

    }



    private static void rotateCropForSF(Rect crop, int rot) {

        if (rot == Surface.ROTATION_90 || rot == Surface.ROTATION_270) {

            int tmp = crop.top;

            crop.top = crop.left;

            crop.left = tmp;

            tmp = crop.right;

            crop.right = crop.bottom;

            crop.bottom = tmp;

        }

    }



    /**

     * Captures a layer and its children into the provided {@link Surface}.

     *

packages/Shell/src/com/android/shell/Screenshooter.java

+6 −76
Original line number Diff line number Diff line
@@ -17,12 +17,11 @@ 
package com.android.shell;



import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Point;

import android.graphics.Rect;

import android.hardware.display.DisplayManagerGlobal;

import android.util.Log;

import android.view.Display;

import android.view.Surface;

import android.view.SurfaceControl;



/**
@@ -35,18 +34,6 @@ final class Screenshooter { 


    private static final String TAG = "Screenshooter";



    /** Rotation constant: Freeze rotation to 0 degrees (natural orientation) */

    public static final int ROTATION_FREEZE_0 = Surface.ROTATION_0;



    /** Rotation constant: Freeze rotation to 90 degrees . */

    public static final int ROTATION_FREEZE_90 = Surface.ROTATION_90;



    /** Rotation constant: Freeze rotation to 180 degrees . */

    public static final int ROTATION_FREEZE_180 = Surface.ROTATION_180;



    /** Rotation constant: Freeze rotation to 270 degrees . */

    public static final int ROTATION_FREEZE_270 = Surface.ROTATION_270;



    /**

     * Takes a screenshot.

     *
@@ -60,78 +47,21 @@ final class Screenshooter { 
        final int displayWidth = displaySize.x;

        final int displayHeight = displaySize.y;



        final float screenshotWidth;

        final float screenshotHeight;



        final int rotation = display.getRotation();

        switch (rotation) {

            case ROTATION_FREEZE_0: {

                screenshotWidth = displayWidth;

                screenshotHeight = displayHeight;

            } break;

            case ROTATION_FREEZE_90: {

                screenshotWidth = displayHeight;

                screenshotHeight = displayWidth;

            } break;

            case ROTATION_FREEZE_180: {

                screenshotWidth = displayWidth;

                screenshotHeight = displayHeight;

            } break;

            case ROTATION_FREEZE_270: {

                screenshotWidth = displayHeight;

                screenshotHeight = displayWidth;

            } break;

            default: {

                throw new IllegalArgumentException("Invalid rotation: "

                        + rotation);

            }

        }



        int rotation = display.getRotation();

        Rect crop = new Rect(0, 0, displayWidth, displayHeight);

        Log.d(TAG, "Taking screenshot of dimensions " + displayWidth + " x " + displayHeight);

        // Take the screenshot

        Bitmap screenShot =

                SurfaceControl.screenshot((int) screenshotWidth, (int) screenshotHeight);

                SurfaceControl.screenshot(crop, displayWidth, displayHeight, rotation);

        if (screenShot == null) {

            Log.e(TAG, "Failed to take screenshot of dimensions " + screenshotWidth + " x "

                    + screenshotHeight);

            Log.e(TAG, "Failed to take screenshot of dimensions " + displayWidth + " x "

                    + displayHeight);

            return null;

        }



        // Rotate the screenshot to the current orientation

        if (rotation != ROTATION_FREEZE_0) {

            Bitmap unrotatedScreenShot = Bitmap.createBitmap(displayWidth, displayHeight,

                    Bitmap.Config.ARGB_8888, screenShot.hasAlpha(), screenShot.getColorSpace());

            Canvas canvas = new Canvas(unrotatedScreenShot);

            canvas.translate(unrotatedScreenShot.getWidth() / 2,

                    unrotatedScreenShot.getHeight() / 2);

            canvas.rotate(getDegreesForRotation(rotation));

            canvas.translate(- screenshotWidth / 2, - screenshotHeight / 2);

            canvas.drawBitmap(screenShot, 0, 0, null);

            canvas.setBitmap(null);

            screenShot.recycle();

            screenShot = unrotatedScreenShot;

        }



        // Optimization

        screenShot.setHasAlpha(false);



        return screenShot;

    }



    private static float getDegreesForRotation(int value) {

        switch (value) {

            case Surface.ROTATION_90: {

                return 360f - 90f;

            }

            case Surface.ROTATION_180: {

                return 360f - 180f;

            }

            case Surface.ROTATION_270: {

                return 360f - 270f;

            } default: {

                return 0;

            }

        }

    }



}