Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5b6ff1b authored by Android Code Review's avatar Android Code Review
Browse files

Merge change Ic93ca0d7 

* changes:
  Don't return when blocking is true.
parents 8e5cac4e 774f5457

libs/ui/SurfaceComposerClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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));