summaryrefslogtreecommitdiffstats
path: root/graphics/mapper
diff options
context:
space:
mode:
authorPeiyong Lin <lpy@google.com>2018-03-28 12:09:42 -0700
committerPeiyong Lin <lpy@google.com>2018-04-02 15:56:45 -0700
commita2acfa2219bda99e384b16df365274f9ab4aa471 (patch)
tree15d16a6af0ce3f8a1b93d3225a16a9e108868ae1 /graphics/mapper
parentaa6eca99e3916b0cbbe600b6c68669bf25db1949 (diff)
downloadplatform_hardware_interfaces-a2acfa2219bda99e384b16df365274f9ab4aa471.tar.gz
platform_hardware_interfaces-a2acfa2219bda99e384b16df365274f9ab4aa471.tar.bz2
platform_hardware_interfaces-a2acfa2219bda99e384b16df365274f9ab4aa471.zip
[Graphics] Update CommandWriter APIs to common::V1_1::* enum.
Previously we introduced Dataspace V1.1 and PixelFormat V1.1, thus APIs accepting Dataspace should also be updated to accept V1_1::Dataspace and V1_1::PixelFormat. BUG: 77156734 Test: adb shell /data/nativetest/VtsHalGraphicsComposerV2_2TargetTest/VtsHalGraphicsComposerV2_2TargetTest Change-Id: I00d00749f2895b727a18a28903256128a33e8b97
Diffstat (limited to 'graphics/mapper')
-rw-r--r--graphics/mapper/2.1/utils/vts/MapperVts.cpp7
-rw-r--r--graphics/mapper/2.1/utils/vts/include/mapper-vts/2.1/MapperVts.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/graphics/mapper/2.1/utils/vts/MapperVts.cpp b/graphics/mapper/2.1/utils/vts/MapperVts.cpp
index 0aaa926018..078068e306 100644
--- a/graphics/mapper/2.1/utils/vts/MapperVts.cpp
+++ b/graphics/mapper/2.1/utils/vts/MapperVts.cpp
@@ -43,6 +43,13 @@ static_assert(sizeof(OldBufferDescriptorInfo) == sizeof(IMapper::BufferDescripto
offsetof(IMapper::BufferDescriptorInfo, usage),
"");
+Gralloc::Gralloc() : V2_0::vts::Gralloc() {
+ if (::testing::Test::HasFatalFailure()) {
+ return;
+ }
+ init();
+}
+
Gralloc::Gralloc(const std::string& allocatorServiceName, const std::string& mapperServiceName)
: V2_0::vts::Gralloc(allocatorServiceName, mapperServiceName) {
if (::testing::Test::HasFatalFailure()) {
diff --git a/graphics/mapper/2.1/utils/vts/include/mapper-vts/2.1/MapperVts.h b/graphics/mapper/2.1/utils/vts/include/mapper-vts/2.1/MapperVts.h
index b7fa751936..423d4b3c0d 100644
--- a/graphics/mapper/2.1/utils/vts/include/mapper-vts/2.1/MapperVts.h
+++ b/graphics/mapper/2.1/utils/vts/include/mapper-vts/2.1/MapperVts.h
@@ -32,6 +32,7 @@ using V2_0::BufferDescriptor;
// A wrapper to IAllocator and IMapper.
class Gralloc : public V2_0::vts::Gralloc {
public:
+ Gralloc();
Gralloc(const std::string& allocatorServiceName, const std::string& mapperServiceName);
sp<IMapper> getMapper() const;