commit 1a56b98485db50c93f8099a3095c44902934f80e
author Wei Sheng Shih <wilsonshih@google.com> Wed Jul 24 10:38:22 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 24 10:38:22 2024 +0000
tree c8e0e207d9be2d6c175ab09a22407211dbb79702
parent f7582a00d64dee4de804163f9711e2c85c23a35c
parent 50e17a52727a4abe384617ff5bc2131bb79de913

Merge "Allow IME snapshot to capture with secure layer for transition" into main

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

diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java
index 57c7753..235deb2 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotController.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java
@@ -232,8 +232,14 @@
         if (imeWindow != null && imeWindow.isVisible()) {
             final Rect bounds = imeWindow.getParentFrame();
             bounds.offsetTo(0, 0);
-            imeBuffer = ScreenCapture.captureLayersExcluding(imeWindow.getSurfaceControl(),
-                    bounds, 1.0f, pixelFormat, null);
+            ScreenCapture.LayerCaptureArgs captureArgs = new ScreenCapture.LayerCaptureArgs.Builder(
+                    imeWindow.getSurfaceControl())
+                    .setSourceCrop(bounds)
+                    .setFrameScale(1.0f)
+                    .setPixelFormat(pixelFormat)
+                    .setCaptureSecureLayers(true)
+                    .build();
+            imeBuffer = ScreenCapture.captureLayers(captureArgs);
         }
         return imeBuffer;
     }