summaryrefslogtreecommitdiffstats
path: root/libs/ui/SurfaceComposerClient.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ui/SurfaceComposerClient.cpp')
-rw-r--r--libs/ui/SurfaceComposerClient.cpp2
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));