commit f207cca044ed44004d35b4f2f88337a2913ffd34
author Valerie Hau <vhau@google.com> Mon May 11 23:34:30 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 11 23:34:30 2020 +0000
tree 32a8c9ed8240e7ba705c4f1844a7fa1ffa16ed62
parent 425e365256fa11d21472cd8c684c3abf89265293
parent 7b4e37a989e71e34524863e9f02d526c5ea1d088

Merge "Allow for failure in allocation for MapperVts" into rvc-dev

graphics/mapper/4.0/utils/vts/MapperVts.cpp

diff --git a/graphics/mapper/4.0/utils/vts/MapperVts.cpp b/graphics/mapper/4.0/utils/vts/MapperVts.cpp
index cb90fa0..9f907e6 100644
--- a/graphics/mapper/4.0/utils/vts/MapperVts.cpp
+++ b/graphics/mapper/4.0/utils/vts/MapperVts.cpp
@@ -90,6 +90,9 @@
     mAllocator->allocate(
             descriptor, count,
             [&](const auto& tmpError, const auto& tmpStride, const auto& tmpBuffers) {
+                if (allowFailure && tmpError == Error::UNSUPPORTED) {
+                    return;
+                }
                 ASSERT_EQ(Error::NONE, tmpError) << "failed to allocate buffers";
                 ASSERT_EQ(count, tmpBuffers.size()) << "invalid buffer array";