commit 8b6afd52e2909c5a2496c6d12075dd3c012a2b84
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 24 23:50:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 24 23:50:29 2017 +0000
tree 98940a6080064bed75349548f277c999e154efef
parent 448beed214a8598c1f978b6548443e5a06fb4ba8
parent 1791e788203157527ca2d643513e873281d5d433

Merge "graphics: early return in CommandWriterBase::writeQueue"

graphics/composer/2.1/default/IComposerCommandBuffer.h

diff --git a/graphics/composer/2.1/default/IComposerCommandBuffer.h b/graphics/composer/2.1/default/IComposerCommandBuffer.h
index 058709c..c752f8a 100644
--- a/graphics/composer/2.1/default/IComposerCommandBuffer.h
+++ b/graphics/composer/2.1/default/IComposerCommandBuffer.h
@@ -92,6 +92,13 @@
     bool writeQueue(bool* outQueueChanged, uint32_t* outCommandLength,
             hidl_vec<hidl_handle>* outCommandHandles)
     {
+        if (mDataWritten == 0) {
+            *outQueueChanged = false;
+            *outCommandLength = 0;
+            outCommandHandles->setToExternal(nullptr, 0);
+            return true;
+        }
+
         // After data are written to the queue, it may not be read by the
         // remote reader when
         //