From c93ca0d7b5661e105603c4e6f7d1903fadfe1a08 Mon Sep 17 00:00:00 2001
From: Li Wenhao <gliwenhao@gmail.com>
Date: Mon, 21 Sep 2009 17:14:59 +0800
Subject: [PATCH] Don't return when blocking is true.

---
 libs/ui/SurfaceComposerClient.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/ui/SurfaceComposerClient.cpp b/libs/ui/SurfaceComposerClient.cpp
index fe803ff24964f..c546a0f207c90 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));