commit 8b834ffd9b1c5df77413e99a3fdfacf6cd89ed52
author Jesse Hall <jessehall@google.com> Fri Mar 28 09:02:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 28 09:02:02 2014 +0000
tree a3be02eca369f3c5c53ea4b3e992443a2a0386e8
parent 80a2f030517ec70173b2a8cc5a358b9683a71aa0
parent 1b7512036f3ea55cb1f62777ba6e56aad781f11c

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

* commit '1b7512036f3ea55cb1f62777ba6e56aad781f11c':
  GraphicProducerWrapper may return false transact status

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0650d97..d084bf5 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2687,7 +2687,7 @@
             looper->sendMessage(this, Message(MSG_API_CALL));
             barrier.wait();
         }
-        return NO_ERROR;
+        return result;
     }
 
     /*
@@ -2697,7 +2697,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;