diff options
| author | 2011-02-27 15:27:22 -0800 | |
|---|---|---|
| committer | 2011-02-27 15:27:22 -0800 | |
| commit | eafc33acff6654e259a75f673cb97cd9f8898cba (patch) | |
| tree | 7eb92bbed65fe714361d5a9ee94e56eb7f563aa8 | |
| parent | c174c6696c78a225a538e436dc659814840663f9 (diff) | |
| parent | 8a08392833a2db80aef20fba8a43f0829a096e13 (diff) | |
Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 4876946f2b..4b3235d429 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -2427,7 +2427,7 @@ ssize_t UserClient::getTokenForSurface(const sp<ISurface>& sur) const } break; } - if (++name > 31) + if (++name >= SharedBufferStack::NUM_LAYERS_MAX) name = NO_MEMORY; } while(name >= 0); |