summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Stoza <stoza@google.com> 2015-06-01 22:09:30 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-01 22:09:30 +0000
commitae892959e45a93fea665cbb0ac01a99c95f44c10 (patch)
tree0615e4dd6f1f55d0046b5b31c7e5a639ee0cf675
parent67ff12d9522168120be2bb58eee20e5f39f84d76 (diff)
parent8980e0ccd4608adbef0d7c80ead97cec995e269c (diff)
am 8980e0cc: Merge "libgui: Propagate error by clearing sp<GB>"
* commit '8980e0ccd4608adbef0d7c80ead97cec995e269c': libgui: Propagate error by clearing sp<GB>
-rw-r--r--libs/gui/IGraphicBufferAlloc.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/gui/IGraphicBufferAlloc.cpp b/libs/gui/IGraphicBufferAlloc.cpp
index 09b63a189e..3009989964 100644
--- a/libs/gui/IGraphicBufferAlloc.cpp
+++ b/libs/gui/IGraphicBufferAlloc.cpp
@@ -59,6 +59,9 @@ public:
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.