commit 36d5f8ef5dca730d5df90edd0be264a7fa6a1f2c
author Vishnu Nair <vishnun@google.com> Sun Mar 19 13:31:35 2023 -0700
committer Vishnu Nair <vishnun@google.com> Mon Mar 20 23:16:28 2023 +0000
tree a732e4d6e875c85145a51552239edb8cb9862e49
parent 6d49710e8d198bf053ab0a4eb3e142bb47cedde2

[sf] fix screenshots when new fe is enabled

- Use uid in layer state when filtering by uid for screenshots
  because there is a mismatch between uid provided by layer
  and input info (b/271132344)
- Pass transform and buffersize into LayerRenderArea so we
  don't need to check legacy drawing state.

Bug: 238781169
Test: atest SurfaceFlinger_test

Change-Id: I2bd5ceeba8303cad2996f521ea03f727269a7a96

services/surfaceflinger/LayerRenderArea.cpp

diff --git a/services/surfaceflinger/LayerRenderArea.cpp b/services/surfaceflinger/LayerRenderArea.cpp
index 03a7f22..1b8ff28 100644
--- a/services/surfaceflinger/LayerRenderArea.cpp
+++ b/services/surfaceflinger/LayerRenderArea.cpp
@@ -39,9 +39,12 @@
 
 LayerRenderArea::LayerRenderArea(SurfaceFlinger& flinger, sp<Layer> layer, const Rect& crop,
                                  ui::Size reqSize, ui::Dataspace reqDataSpace, bool childrenOnly,
-                                 bool allowSecureLayers)
+                                 bool allowSecureLayers, const ui::Transform& layerTransform,
+                                 const Rect& layerBufferSize)
       : RenderArea(reqSize, CaptureFill::CLEAR, reqDataSpace, allowSecureLayers),
         mLayer(std::move(layer)),
+        mLayerTransform(layerTransform),
+        mLayerBufferSize(layerBufferSize),
         mCrop(crop),
         mFlinger(flinger),
         mChildrenOnly(childrenOnly) {}
@@ -60,7 +63,8 @@
 
 Rect LayerRenderArea::getSourceCrop() const {
     if (mCrop.isEmpty()) {
-        return mLayer->getBufferSize(mLayer->getDrawingState());
+        // TODO this should probably be mBounds instead of just buffer bounds
+        return mLayerBufferSize;
     } else {
         return mCrop;
     }
@@ -70,7 +74,7 @@
     using namespace std::string_literals;
 
     if (!mChildrenOnly) {
-        mTransform = mLayer->getTransform().inverse();
+        mTransform = mLayerTransform.inverse();
     }
 
     if (mFlinger.mLayerLifecycleManagerEnabled) {