diff options
| author | Jesse Hall <jessehall@google.com> | 2014-03-28 09:02:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-28 09:02:02 +0000 |
| commit | 8b834ffd9b1c5df77413e99a3fdfacf6cd89ed52 (patch) | |
| tree | a3be02eca369f3c5c53ea4b3e992443a2a0386e8 | |
| parent | 80a2f030517ec70173b2a8cc5a358b9683a71aa0 (diff) | |
| parent | 1b7512036f3ea55cb1f62777ba6e56aad781f11c (diff) | |
| download | frameworks_native-8b834ffd9b1c5df77413e99a3fdfacf6cd89ed52.zip frameworks_native-8b834ffd9b1c5df77413e99a3fdfacf6cd89ed52.tar.gz frameworks_native-8b834ffd9b1c5df77413e99a3fdfacf6cd89ed52.tar.bz2 | |
am 1b751203: am 50ef8562: Merge "GraphicProducerWrapper may return false transact status"
* commit '1b7512036f3ea55cb1f62777ba6e56aad781f11c':
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 0650d97..d084bf5 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -2687,7 +2687,7 @@ class GraphicProducerWrapper : public BBinder, public MessageHandler { looper->sendMessage(this, Message(MSG_API_CALL)); barrier.wait(); } - return NO_ERROR; + return result; } /* @@ -2697,7 +2697,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; |