commit 76630c6567ba8de44afac957fa6d6f7360120ea7
author Chia-I Wu <olv@google.com> Tue May 22 12:52:36 2018 -0700
committer Chia-I Wu <olv@google.com> Tue May 22 13:05:26 2018 -0700
tree dd24f1e422530166da10b4839650cd30a005e920
parent a1efbcfce00b89048a16b8a49d9c222812045250

graphics: fix readback buffer tests

Make readback buffer support optional.  Fix incorrect use of
setReadbackBuffer and getReadbackBufferFence.

Bug:  80030364
Test: VTS
Change-Id: I278a031c3c086ac38c460b7076a2952db57a91a4

graphics/composer/2.2/utils/vts/ComposerVts.cpp

diff --git a/graphics/composer/2.2/utils/vts/ComposerVts.cpp b/graphics/composer/2.2/utils/vts/ComposerVts.cpp
index ae9e430..f2596a4 100644
--- a/graphics/composer/2.2/utils/vts/ComposerVts.cpp
+++ b/graphics/composer/2.2/utils/vts/ComposerVts.cpp
@@ -44,6 +44,10 @@
     return client;
 }
 
+sp<IComposerClient> ComposerClient::getRaw() const {
+    return mClient;
+}
+
 std::vector<IComposerClient::PerFrameMetadataKey> ComposerClient::getPerFrameMetadataKeys(
     Display display) {
     std::vector<IComposerClient::PerFrameMetadataKey> keys;

graphics/composer/2.2/utils/vts/include/composer-vts/2.2/ComposerVts.h

diff --git a/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/ComposerVts.h b/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/ComposerVts.h
index f8bc1d9..2633021 100644
--- a/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/ComposerVts.h
+++ b/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/ComposerVts.h
@@ -58,6 +58,8 @@
     explicit ComposerClient(const sp<IComposerClient>& client)
         : V2_1::vts::ComposerClient(client), mClient(client) {}
 
+    sp<IComposerClient> getRaw() const;
+
     void execute(V2_1::vts::TestCommandReader* reader, CommandWriterBase* writer);
 
     std::vector<IComposerClient::PerFrameMetadataKey> getPerFrameMetadataKeys(Display display);