Merge change Id23b791a into eclair

* changes:
  fix [2170283] SurfaceFlinger crashes on OOM.

1 files changed, 2 insertions, 0 deletions

diff --git a/libs/ui/Surface.cpp b/libs/ui/Surface.cpp
index 2d83a8c3106d..f51ca7a953c7 100644
--- a/libs/ui/Surface.cpp
+++ b/libs/ui/Surface.cpp
@@ -746,6 +746,8 @@ status_t Surface::getBufferLocked(int index, int usage)
                 currentBuffer->setIndex(index);
                 mNeedFullUpdate = true;
             }
+        } else {
+            err = err<0 ? err : NO_MEMORY;
         }
     }
     return err;