diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-02-27 15:44:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-27 15:44:36 -0800 |
| commit | e630e5f49ba15005172dceeda7299569b2d2351f (patch) | |
| tree | 891d6bd6a98c70e37e3993fec0ae906df6ac3bc3 | |
| parent | 6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf (diff) | |
| parent | 919853ce244f853966817d4adb2f3b7b6e4bbe74 (diff) | |
| download | frameworks_base-e630e5f49ba15005172dceeda7299569b2d2351f.zip frameworks_base-e630e5f49ba15005172dceeda7299569b2d2351f.tar.gz frameworks_base-e630e5f49ba15005172dceeda7299569b2d2351f.tar.bz2 | |
am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
* commit '919853ce244f853966817d4adb2f3b7b6e4bbe74':
Prevent SurfaceFlinger from using layer token 31.
| -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 4876946..4b3235d 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); |