commit 03031766dd3978edbb4b6e6d39139d215036921c
author Lingfeng Yang <lfy@google.com> Wed May 25 08:31:06 2016 -0700
committer Lingfeng Yang <lfy@google.com> Fri May 27 16:05:11 2016 +0000
tree b7b18b5a1f70b4121326e15b8815bf3ec7a07b42
parent ca3b20ff0dd8fed5dae26409c255c68ce73723af

Don't optimize out rcUpdateColorBuffer

bug:28406160

If we want to use rcUpdateColorBuffer to
synchronize on the host in order to remove
out of order webcam frames, we need to call it
if (cb->hostHandle), not just when
the width and height are nonzero.

Otherwise, we get deadlocks.

Change-Id: Ib98774b935e8786e307dd38711a0f2f9ffea440e
(cherry picked from commit 6298285500362b217b73b96def2ce207e206171d)

opengl/system/gralloc/gralloc.cpp

diff --git a/opengl/system/gralloc/gralloc.cpp b/opengl/system/gralloc/gralloc.cpp
index f597d2b..f8f9292 100644
--- a/opengl/system/gralloc/gralloc.cpp
+++ b/opengl/system/gralloc/gralloc.cpp
@@ -732,7 +732,7 @@
     // if buffer was locked for s/w write, we need to update the host with
     // the updated data
     //
-    if (cb->lockedWidth > 0 && cb->lockedHeight > 0 && cb->hostHandle) {
+    if (cb->hostHandle) {
 
         // Make sure we have host connection
         DEFINE_AND_VALIDATE_HOST_CONNECTION;