diff options
| author | Li Wenhao <gliwenhao@gmail.com> | 2009-09-21 17:14:59 +0800 |
|---|---|---|
| committer | Li Wenhao <gliwenhao@gmail.com> | 2009-09-21 17:14:59 +0800 |
| commit | 774f5457cca4459a36714004e64d460d49557a06 (patch) | |
| tree | a958f8fabc487aa4e794dd2236622e2f23de8f44 | |
| parent | 17a8f6901e3f1a40a142954f67b4823faeb0c23e (diff) | |
| download | frameworks_native-774f5457cca4459a36714004e64d460d49557a06.zip frameworks_native-774f5457cca4459a36714004e64d460d49557a06.tar.gz frameworks_native-774f5457cca4459a36714004e64d460d49557a06.tar.bz2 | |
Don't return when blocking is true.
| -rw-r--r-- | libs/ui/SurfaceComposerClient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/SurfaceComposerClient.cpp b/libs/ui/SurfaceComposerClient.cpp index fe803ff..c546a0f 100644 --- a/libs/ui/SurfaceComposerClient.cpp +++ b/libs/ui/SurfaceComposerClient.cpp @@ -180,7 +180,7 @@ int32_t per_client_cblk_t::lock_layer(size_t i, uint32_t flags) return INVALID_OPERATION; } - if (UNLIKELY(state&eLocked)) { + if (UNLIKELY(state&eLocked) && !blocking) { LOGE("eLocked set when entering lock_layer(), " "layer=%d (lcblk=%p), state=%08x", int(i), layer, int(state)); |