summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jamie Gennis <jgennis@google.com> 2011-02-27 15:27:22 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-02-27 15:27:22 -0800
commit919853ce244f853966817d4adb2f3b7b6e4bbe74 (patch)
tree733ed1b30ade379432e83e72208bd357cbe37584
parent092238916fd5d10090c0bcad33644778a1f366e7 (diff)
parentc86d904b71be950ad973d803d1a19c6cd13be669 (diff)
Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 4876946f2b3d..4b3235d429f0 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);