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

Commit cc03f083 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Use non-protected screenshot buffer to calculate animation color 

The screenshot for animation needs to be "setAllowProtected(true)",
otherwise the protected area will be blank. But it is unable to
be used to extract color because protected content is not readable.

To avoid the background rotation animation always showing black
color in this case (it looks flickering if the main color of screen
is light), use the source surface with excluding protected content
to calculate the color.

Bug: 342984506
Test: Enable auto rotation, home rotation.
      Set wallpaper to white color.
      Play DRM protected video in PiP mode.
      Rotate the device.
      The animation background should be white.
Change-Id: I346c9683e2c58891103031bf9adf662a7044132c
parent df5244aa

core/java/com/android/internal/policy/TransitionAnimation.java

+15 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,21 @@ public class TransitionAnimation { 
                == HardwareBuffer.USAGE_PROTECTED_CONTENT;

    }



    /**

     * Returns the luminance in 0~1. The surface control is the source of the hardware buffer,

     * which will be used if the buffer is protected from reading.

     */

    public static float getBorderLuma(@NonNull HardwareBuffer hwBuffer,

            @NonNull ColorSpace colorSpace, @NonNull SurfaceControl sourceSurfaceControl) {

        if (hasProtectedContent(hwBuffer)) {

            // The buffer cannot be read. Capture another buffer which excludes protected content

            // from the source surface.

            return getBorderLuma(sourceSurfaceControl, hwBuffer.getWidth(), hwBuffer.getHeight());

        }

        // Use the existing buffer directly.

        return getBorderLuma(hwBuffer, colorSpace);

    }



    /** Returns the luminance in 0~1. */

    public static float getBorderLuma(SurfaceControl surfaceControl, int w, int h) {

        final ScreenCapture.ScreenshotHardwareBuffer buffer =

libs/WindowManager/Shell/src/com/android/wm/shell/transition/ScreenRotationAnimation.java

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ class ScreenRotationAnimation { 
                t.show(mScreenshotLayer);

                if (!isCustomRotate()) {

                    mStartLuma = TransitionAnimation.getBorderLuma(hardwareBuffer,

                            screenshotBuffer.getColorSpace());

                            screenshotBuffer.getColorSpace(), mSurfaceControl);

                }

                hardwareBuffer.close();

            }

services/core/java/com/android/server/wm/Transition.java

+1 −1
Original line number Diff line number Diff line
@@ -3757,7 +3757,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            if (changeInfo.mRotation != wc.mDisplayContent.getRotation()) {

                // This isn't cheap, so only do it for rotation change.

                changeInfo.mSnapshotLuma = TransitionAnimation.getBorderLuma(

                        buffer, screenshotBuffer.getColorSpace());

                        buffer, screenshotBuffer.getColorSpace(), wc.mSurfaceControl);

            }

            SurfaceControl.Transaction t = wc.mWmService.mTransactionFactory.get();

            TransitionAnimation.configureScreenshotLayer(t, snapshotSurface, screenshotBuffer);