commit 3d6ddfe77133198f48f0670d93172ee67d5b5ea7
author Mathias Agopian <mathias@google.com> Mon Jul 06 20:19:16 2009 -0700
committer Mathias Agopian <mathias@google.com> Mon Jul 06 20:54:51 2009 -0700
tree 449f7c3ed7e7dbcc05318cfea329da110050b609
parent da1b975339f714aaaf0939fd5db64a86cb48ee88

fix [1964228] emulator crash with the new GL

gralloc didn't keep the error state properly, so after the first pmem allocation failure, it would systematically fail without reverting to ashmem.

modules/gralloc/gralloc.cpp

diff --git a/modules/gralloc/gralloc.cpp b/modules/gralloc/gralloc.cpp
index af1ed66..a371f05 100644
--- a/modules/gralloc/gralloc.cpp
+++ b/modules/gralloc/gralloc.cpp
@@ -195,9 +195,9 @@
 
 static int init_pmem_area(private_module_t* m)
 {
-    int err = 0;
     pthread_mutex_lock(&m->lock);
-    if (m->pmem_master == -1) {
+    int err = m->pmem_master;
+    if (err == -1) {
         err = init_pmem_area_locked(m);
         if (err) {
             m->pmem_master = err;