commit db7b742f65b2b88ea414e666e1079cc21b51f715
author Jamie Gennis <jgennis@google.com> Sun Feb 27 15:44:36 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sun Feb 27 15:44:36 2011 -0800
tree 1c6db7a9e7e55e8c51db4bd409c033b5adc03a55
parent 2a4d60e301f35499aa3658c85e8b6ec5cbf1a7a2
parent eafc33acff6654e259a75f673cb97cd9f8898cba

am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread

* commit '919853ce244f853966817d4adb2f3b7b6e4bbe74':
  Prevent SurfaceFlinger from using layer token 31.

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 4876946..4b3235d 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2427,7 +2427,7 @@
             }
             break;
         }
-        if (++name > 31)
+        if (++name >= SharedBufferStack::NUM_LAYERS_MAX)
             name = NO_MEMORY;
     } while(name >= 0);