surfaceflinger: fix race conditions in captureScreen
The display was looked up without holding the state lock. It was
also used (including indirectly from updateDimensions) without
holding the lock either.
Inline updateDimensions in captureScreen with the state lock held.
Stop calling updateDimensions in captureLayers.
Bug: 113041375
Test: take screenshot, rotate screen, screencap
Change-Id: I8b361847c44373ce08930d906ec4a995efd1c21b
diff --git a/services/surfaceflinger/RenderArea.h b/services/surfaceflinger/RenderArea.h
index c12ff45..3c11e73 100644
--- a/services/surfaceflinger/RenderArea.h
+++ b/services/surfaceflinger/RenderArea.h
@@ -70,11 +70,9 @@
// covered by any rendered layer should be filled with this color.
CaptureFill getCaptureFill() const { return mCaptureFill; };
- status_t updateDimensions(int displayRotation);
-
private:
- uint32_t mReqWidth;
- uint32_t mReqHeight;
+ const uint32_t mReqWidth;
+ const uint32_t mReqHeight;
const CaptureFill mCaptureFill;
const ui::Transform::orientation_flags mRotationFlags;
};