commit 438ca07b6ba74235e87bfbd78c94874d8bbde391
author Mathias Agopian <mathias@google.com> Thu Mar 07 01:47:34 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 07 01:47:34 2013 +0000
tree 40fdc15cc3c3547cc39292313aff03ef22c708b0
parent 175264b09c6080b29a23fc9f545d4b99445714bd
parent 13127d8921356dff794250e04208c3ed60b3a3df

Merge changes I66511c08,Ia051949f,Ic7451365,I5b571a4c into jb-mr2-dev

* changes:
  Get rid of LayerBase.
  Make LayerDim a regular Layer instead of a LayerBase
  fold LayerBaseClient into LayerBase
  Remove support for ScreenshotLayer

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index a27d185..f1e9c65 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2795,6 +2795,8 @@
                     *h = sh;
                     *f = PIXEL_FORMAT_RGBA_8888;
                     result = NO_ERROR;
+                } else {
+                    result = NO_MEMORY;
                 }
             } else {
                 result = NO_MEMORY;