diff options
| author | 2022-11-25 17:17:38 +0000 | |
|---|---|---|
| committer | 2022-11-25 17:17:38 +0000 | |
| commit | 550d8e68eb2fb609ec1133ebbbd9e952b6e7243f (patch) | |
| tree | 298396b0e230031191a87a595525e6e6a69dde99 | |
| parent | 65f1d04dcdd836f8c4c02df2f9807cd708b527c4 (diff) | |
| parent | 96c4978054d8524112169b0276b40d788fd03218 (diff) | |
Merge "Capture secure layers for edge extension" into tm-qpr-dev am: 96c4978054
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20554935
Change-Id: I4e4f93376506dedc5ca2fc279a2361a38bec8560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/transition/TransitionAnimationHelper.java | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/SurfaceAnimationRunner.java | 1 |
2 files changed, 2 insertions, 0 deletions
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); |