commit 3d6022a43e18dbb209da485e1c6353e916d5de12
author Dan Stoza <stoza@google.com> Mon Jun 01 13:59:15 2015 -0700
committer Dan Stoza <stoza@google.com> Mon Jun 01 14:58:35 2015 -0700
tree 0615e4dd6f1f55d0046b5b31c7e5a639ee0cf675
parent cf1edb3f3ece597dcf9c3f4ae018374550e8b561

libgui: Propagate error by clearing sp<GB>

Clears the sp<GraphicBuffer> returned by createGraphicBuffer when there
is an error during unflattening.

Bug: 21498231
Change-Id: I886da4474fc06853cc59188d62044b7d7549126b
(cherry picked from commit 6a04e5fcf67e754b215301fe38a6401db567f4b5)

libs/gui/IGraphicBufferAlloc.cpp

diff --git a/libs/gui/IGraphicBufferAlloc.cpp b/libs/gui/IGraphicBufferAlloc.cpp
index 09b63a1..3009989 100644
--- a/libs/gui/IGraphicBufferAlloc.cpp
+++ b/libs/gui/IGraphicBufferAlloc.cpp
@@ -59,6 +59,9 @@
         if (result == NO_ERROR) {
             graphicBuffer = new GraphicBuffer();
             result = reply.read(*graphicBuffer);
+            if (result != NO_ERROR) {
+                graphicBuffer.clear();
+            }
             // reply.readStrongBinder();
             // here we don't even have to read the BufferReference from
             // the parcel, it'll die with the parcel.