commit 1b7512036f3ea55cb1f62777ba6e56aad781f11c
author Jesse Hall <jessehall@google.com> Fri Mar 28 08:50:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 28 08:50:09 2014 +0000
tree e227f8088763c9bfcb355dbd977ba5b65d0c30f4
parent d9ee7dee2cf42c0e672c7ac85c0252a22d3e5f08
parent 50ef8562fe7289495ad8592226f3c4d546119892

am 50ef8562: Merge "GraphicProducerWrapper may return false transact status"

* commit '50ef8562fe7289495ad8592226f3c4d546119892':
  GraphicProducerWrapper may return false transact status

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index a12db6d..e32974f 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2641,7 +2641,7 @@
             looper->sendMessage(this, Message(MSG_API_CALL));
             barrier.wait();
         }
-        return NO_ERROR;
+        return result;
     }
 
     /*
@@ -2651,7 +2651,7 @@
     virtual void handleMessage(const Message& message) {
         android_atomic_release_load(&memoryBarrier);
         if (message.what == MSG_API_CALL) {
-            impl->asBinder()->transact(code, data[0], reply);
+            result = impl->asBinder()->transact(code, data[0], reply);
             barrier.open();
         } else if (message.what == MSG_EXIT) {
             exitRequested = true;