commit 0a289c9cc8733a893ea145ddbbcc322dc92ea1c8
author Mathias Agopian <mathias@google.com> Wed Aug 21 15:59:20 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 21 15:59:20 2013 -0700
tree ebf26d776e3b7cf2fcf4efe626bca5238c37ddc4
parent 072ca28d7860829083f17d9e24863329010536cf
parent 4ceff3d5efd27c164788bb2b3f0fd17c691a0204

am 4ceff3d5: screenshot layers wouldn\'t work in some cases

* commit '4ceff3d5efd27c164788bb2b3f0fd17c691a0204':
  screenshot layers wouldn't work in some cases

libs/gui/IGraphicBufferProducer.cpp

diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index 3080220..704fa50 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -61,7 +61,11 @@
         bool nonNull = reply.readInt32();
         if (nonNull) {
             *buf = new GraphicBuffer();
-            reply.read(**buf);
+            result = reply.read(**buf);
+            if(result != NO_ERROR) {
+                (*buf).clear();
+                return result;
+            }
         }
         result = reply.readInt32();
         return result;

libs/ui/GraphicBuffer.cpp

diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp
index 0ecd3d9..96a7188 100644
--- a/libs/ui/GraphicBuffer.cpp
+++ b/libs/ui/GraphicBuffer.cpp
@@ -282,6 +282,8 @@
     if (handle != 0) {
         status_t err = mBufferMapper.registerBuffer(handle);
         if (err != NO_ERROR) {
+            width = height = stride = format = usage = 0;
+            handle = NULL;
             ALOGE("unflatten: registerBuffer failed: %s (%d)",
                     strerror(-err), err);
             return err;