commit 65dd86ef39238a27879942c1cfdb20bc463cd735
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 09 03:31:24 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 09 03:31:24 2020 +0000
tree 9230f916c2474b188ba31854733f6c74bb081eee
parent 31e4b8150fd8b160619c26eed412cdb47aa82730
parent 6fa58b7ac41fef952085727969a8857bd34709e2

Merge "Fix BLASTBufferQueueTest stuck on verifing captured pixel"

libs/gui/tests/BLASTBufferQueue_test.cpp

diff --git a/libs/gui/tests/BLASTBufferQueue_test.cpp b/libs/gui/tests/BLASTBufferQueue_test.cpp
index 9299721..f3559fa 100644
--- a/libs/gui/tests/BLASTBufferQueue_test.cpp
+++ b/libs/gui/tests/BLASTBufferQueue_test.cpp
@@ -123,6 +123,7 @@
                 .apply();
 
         mCaptureArgs.displayToken = mDisplayToken;
+        mCaptureArgs.dataspace = ui::Dataspace::V0_SRGB;
     }
 
     void setUpProducer(BLASTBufferQueueHelper adapter, sp<IGraphicBufferProducer>& producer) {
@@ -181,6 +182,7 @@
         for (uint32_t row = 0; row < height; row++) {
             for (uint32_t col = 0; col < width; col++) {
                 uint8_t* pixel = (uint8_t*)(bufData + (row * stride) + col);
+                ASSERT_NE(nullptr, pixel);
                 bool inRegion;
                 if (!outsideRegion) {
                     inRegion = row >= region.top + border && row < region.bottom - border &&