diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-02-27 15:55:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-27 15:55:21 -0800 |
| commit | 0dc5fdb9b2fd3b3e2ede5e9607bc21423f357a01 (patch) | |
| tree | ac13c0be9758579d467da88f8e7675daee85146a | |
| parent | 710c510b36a2d260736ca6d036365b18c86b1774 (diff) | |
| parent | e630e5f49ba15005172dceeda7299569b2d2351f (diff) | |
| download | frameworks_base-0dc5fdb9b2fd3b3e2ede5e9607bc21423f357a01.zip frameworks_base-0dc5fdb9b2fd3b3e2ede5e9607bc21423f357a01.tar.gz frameworks_base-0dc5fdb9b2fd3b3e2ede5e9607bc21423f357a01.tar.bz2 | |
am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
* commit 'e630e5f49ba15005172dceeda7299569b2d2351f':
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 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); |