From 61ecd95ad345de51f51f7a1814601d9ea24b6f5a Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Thu, 24 Nov 2022 14:13:29 +0000 Subject: Capture secure layers for edge extension Test: Using test app provided in the bug to make sure issue doesn't repo Bug: 255298799 Change-Id: Ic5c7b30379a145e01482d0a705fc6ded7afb2137 --- .../src/com/android/wm/shell/transition/TransitionAnimationHelper.java | 1 + services/core/java/com/android/server/wm/SurfaceAnimationRunner.java | 1 + 2 files changed, 2 insertions(+) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/TransitionAnimationHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/TransitionAnimationHelper.java index b75c55274cff..ab792ee122c7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/TransitionAnimationHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/TransitionAnimationHelper.java @@ -321,6 +321,7 @@ public class TransitionAnimationHelper { .setPixelFormat(PixelFormat.RGBA_8888) .setChildrenOnly(true) .setAllowProtected(true) + .setCaptureSecureLayers(true) .build(); final SurfaceControl.ScreenshotHardwareBuffer edgeBuffer = SurfaceControl.captureLayers(captureArgs); diff --git a/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java b/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java index f3670e49f01e..1ae7816ecd24 100644 --- a/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java +++ b/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java @@ -440,6 +440,7 @@ class SurfaceAnimationRunner { .setPixelFormat(PixelFormat.RGBA_8888) .setChildrenOnly(true) .setAllowProtected(true) + .setCaptureSecureLayers(true) .build(); final SurfaceControl.ScreenshotHardwareBuffer edgeBuffer = SurfaceControl.captureLayers(captureArgs); -- cgit v1.2.3-59-g8ed1b