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

Commit 2b7f2aee authored by Chavi Weingarten's avatar Chavi Weingarten
Browse files

Migrate screen capture code to ScreenCapture file 

Test: ScreenshotTests
Bug: 242714168
Change-Id: I8061f1717cc4e293ee07672d6d415c2c36010ccd
parent 4653017c

core/java/android/app/UiAutomationConnection.java

+8 −7
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ import android.view.WindowAnimationFrameStats; 
import android.view.WindowContentFrameStats;

import android.view.WindowContentFrameStats;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.IAccessibilityManager;

import android.view.accessibility.IAccessibilityManager;

import android.window.ScreenCapture;





import libcore.io.IoUtils;

import libcore.io.IoUtils;
@@ -220,13 +221,13 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { 
            int width = crop.width();

            int width = crop.width();

            int height = crop.height();

            int height = crop.height();

            final IBinder displayToken = SurfaceControl.getInternalDisplayToken();

            final IBinder displayToken = SurfaceControl.getInternalDisplayToken();

            final SurfaceControl.DisplayCaptureArgs captureArgs =

            final ScreenCapture.DisplayCaptureArgs captureArgs =

                    new SurfaceControl.DisplayCaptureArgs.Builder(displayToken)

                    new ScreenCapture.DisplayCaptureArgs.Builder(displayToken)

                            .setSourceCrop(crop)

                            .setSourceCrop(crop)

                            .setSize(width, height)

                            .setSize(width, height)

                            .build();

                            .build();

            final SurfaceControl.ScreenshotHardwareBuffer screenshotBuffer =

            final ScreenCapture.ScreenshotHardwareBuffer screenshotBuffer =

                    SurfaceControl.captureDisplay(captureArgs);

                    ScreenCapture.captureDisplay(captureArgs);

            return screenshotBuffer == null ? null : screenshotBuffer.asBitmap();

            return screenshotBuffer == null ? null : screenshotBuffer.asBitmap();

        } finally {

        } finally {

            Binder.restoreCallingIdentity(identity);

            Binder.restoreCallingIdentity(identity);
@@ -242,11 +243,11 @@ public final class UiAutomationConnection extends IUiAutomationConnection.Stub { 
            throwIfNotConnectedLocked();

            throwIfNotConnectedLocked();

        }

        }





        SurfaceControl.ScreenshotHardwareBuffer captureBuffer;

        ScreenCapture.ScreenshotHardwareBuffer captureBuffer;

        final long identity = Binder.clearCallingIdentity();

        final long identity = Binder.clearCallingIdentity();

        try {

        try {

            captureBuffer = SurfaceControl.captureLayers(

            captureBuffer = ScreenCapture.captureLayers(

                    new SurfaceControl.LayerCaptureArgs.Builder(surfaceControl)

                    new ScreenCapture.LayerCaptureArgs.Builder(surfaceControl)

                            .setChildrenOnly(false)

                            .setChildrenOnly(false)

                            .build());

                            .build());

        } finally {

        } finally {

core/java/android/hardware/display/DisplayManagerInternal.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -28,9 +28,9 @@ import android.util.Slog; 
import android.util.SparseArray;

import android.util.SparseArray;

import android.view.Display;

import android.view.Display;

import android.view.DisplayInfo;

import android.view.DisplayInfo;

import android.view.SurfaceControl;

import android.view.SurfaceControl.Transaction;

import android.view.SurfaceControl.Transaction;

import android.window.DisplayWindowPolicyController;

import android.window.DisplayWindowPolicyController;

import android.window.ScreenCapture;





import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;
@@ -118,7 +118,7 @@ public abstract class DisplayManagerInternal { 
     * @param displayId The display id to take the screenshot of.

     * @param displayId The display id to take the screenshot of.

     * @return The buffer or null if we have failed.

     * @return The buffer or null if we have failed.

     */

     */

    public abstract SurfaceControl.ScreenshotHardwareBuffer systemScreenshot(int displayId);

    public abstract ScreenCapture.ScreenshotHardwareBuffer systemScreenshot(int displayId);





    /**

    /**

     * General screenshot functionality that excludes secure layers and applies appropriate

     * General screenshot functionality that excludes secure layers and applies appropriate
@@ -127,7 +127,7 @@ public abstract class DisplayManagerInternal { 
     * @param displayId The display id to take the screenshot of.

     * @param displayId The display id to take the screenshot of.

     * @return The buffer or null if we have failed.

     * @return The buffer or null if we have failed.

     */

     */

    public abstract SurfaceControl.ScreenshotHardwareBuffer userScreenshot(int displayId);

    public abstract ScreenCapture.ScreenshotHardwareBuffer userScreenshot(int displayId);





    /**

    /**

     * Returns information about the specified logical display.

     * Returns information about the specified logical display.

core/java/android/service/wallpaper/WallpaperService.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ import android.view.WindowLayout; 
import android.view.WindowManager;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;

import android.view.WindowManagerGlobal;

import android.window.ClientWindowFrames;

import android.window.ClientWindowFrames;

import android.window.ScreenCapture;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.HandlerCaller;

import com.android.internal.os.HandlerCaller;
@@ -1989,9 +1990,9 @@ public abstract class WallpaperService extends Service { 
                cleanUpScreenshotSurfaceControl();

                cleanUpScreenshotSurfaceControl();

            }

            }





            SurfaceControl.ScreenshotHardwareBuffer screenshotBuffer =

            ScreenCapture.ScreenshotHardwareBuffer screenshotBuffer =

                    SurfaceControl.captureLayers(

                    ScreenCapture.captureLayers(

                            new SurfaceControl.LayerCaptureArgs.Builder(mSurfaceControl)

                            new ScreenCapture.LayerCaptureArgs.Builder(mSurfaceControl)

                                    // Needed because SurfaceFlinger#validateScreenshotPermissions

                                    // Needed because SurfaceFlinger#validateScreenshotPermissions

                                    // uses this parameter to check whether a caller only attempts

                                    // uses this parameter to check whether a caller only attempts

                                    // to screenshot itself when call doesn't come from the system.

                                    // to screenshot itself when call doesn't come from the system.