diff options
| author | Jesse Hall <jessehall@google.com> | 2014-03-28 04:52:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-28 04:52:10 +0000 |
| commit | 50ef8562fe7289495ad8592226f3c4d546119892 (patch) | |
| tree | 086c187dbfa47f5789d5d3a09d39e6bd6157b2af | |
| parent | b1a8c016371282a3cd3b113e6b2c0310372babf2 (diff) | |
| parent | c2633ce19bdbca4cbf8d6a225ede68a0afd693b9 (diff) | |
| download | native-50ef8562fe7289495ad8592226f3c4d546119892.tar.gz | |
Merge "GraphicProducerWrapper may return false transact status"
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index bc559ccf73..943ed02216 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -2639,7 +2639,7 @@ class GraphicProducerWrapper : public BBinder, public MessageHandler { looper->sendMessage(this, Message(MSG_API_CALL)); barrier.wait(); } - return NO_ERROR; + return result; } /* @@ -2649,7 +2649,7 @@ class GraphicProducerWrapper : public BBinder, public MessageHandler { 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; |