Merge change Ic93ca0d7

* changes: Don't return when blocking is true.
2009-11-04 17:31:01 -08:00
parent a74dc60c96 c93ca0d7b5
commit 0b95a572a0
1 changed files with 1 additions and 1 deletions
--- 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));