commit f13447030dbeb2ce48bd421bc01c89cc01e19667
author John Reck <jreck@google.com> Wed Jul 14 14:24:51 2021 -0400
committer John Reck <jreck@google.com> Thu Jul 15 18:48:20 2021 +0000
tree 1e39186558a30e2cec3b53acd99eaf72f28b74ac
parent 245ce4d049dc454ec01dbcf0200d0d55e9d9f476

Avoid sampling outside BQ crop rect

The region outside of the BQ crop rect is potentially
garbage. Avoid sampling from it.

Fixes: 189656466
Bug: 193378020
Test: CTS PixelCopyTests & DecodeAccuracyTest
Change-Id: I2910d93471f08aaf807ac9f87fdf84cf29cf4143
Merged-In: I2910d93471f08aaf807ac9f87fdf84cf29cf4143

libs/hwui/Readback.cpp

diff --git a/libs/hwui/Readback.cpp b/libs/hwui/Readback.cpp
index 25d57f6..e08b99d 100644
--- a/libs/hwui/Readback.cpp
+++ b/libs/hwui/Readback.cpp
@@ -189,8 +189,10 @@
     if (srcRect.width() != bitmap->width() || srcRect.height() != bitmap->height()) {
         paint.setFilterQuality(kLow_SkFilterQuality);
     }
-    canvas->drawImageRect(image, imageSrcRect, imageDstRect, &paint,
-                          SkCanvas::kFast_SrcRectConstraint);
+    const bool hasBufferCrop = cropRect.left < cropRect.right && cropRect.top < cropRect.bottom;
+    auto constraint =
+            hasBufferCrop ? SkCanvas::kStrict_SrcRectConstraint : SkCanvas::kFast_SrcRectConstraint;
+    canvas->drawImageRect(image, imageSrcRect, imageDstRect, &paint, constraint);
     canvas->restore();
 
     if (!tmpSurface->readPixels(*bitmap, 0, 0)) {