commit 50ef8562fe7289495ad8592226f3c4d546119892
author Jesse Hall <jessehall@google.com> Fri Mar 28 04:52:09 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 28 04:52:10 2014 +0000
tree 086c187dbfa47f5789d5d3a09d39e6bd6157b2af
parent b1a8c016371282a3cd3b113e6b2c0310372babf2
parent c2633ce19bdbca4cbf8d6a225ede68a0afd693b9

Merge "GraphicProducerWrapper may return false transact status"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index bc559cc..943ed02 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2639,7 +2639,7 @@
             looper->sendMessage(this, Message(MSG_API_CALL));
             barrier.wait();
         }
-        return NO_ERROR;
+        return result;
     }
 
     /*
@@ -2649,7 +2649,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;