diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-02-27 16:04:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-27 16:04:42 -0800 |
| commit | f272ad210c6834d92b4b4ddaacd069baedf90dcf (patch) | |
| tree | 439e94ac6d6017371b7a14797588b0f0273a83b7 /services | |
| parent | 47b500385196d11dcc68cf8c541f427d8459dad7 (diff) | |
| parent | 0dc5fdb9b2fd3b3e2ede5e9607bc21423f357a01 (diff) | |
| download | frameworks_base-f272ad210c6834d92b4b4ddaacd069baedf90dcf.zip frameworks_base-f272ad210c6834d92b4b4ddaacd069baedf90dcf.tar.gz frameworks_base-f272ad210c6834d92b4b4ddaacd069baedf90dcf.tar.bz2 | |
am 0dc5fdb9: am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
* commit '0dc5fdb9b2fd3b3e2ede5e9607bc21423f357a01':
Prevent SurfaceFlinger from using layer token 31.
Diffstat (limited to 'services')
| -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 fd3f0c2..40882d8 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -2470,7 +2470,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); |