| commit | 661a8c37c86d02271980fbe9fa065ace9141e430 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Mon Feb 28 11:28:38 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Feb 28 11:28:38 2011 -0800 |
| tree | 51ddec29f6a96fa6094989c6cbecef55c8f37beb | |
| parent | 6f6b5081f9b5bce5909a908ec177b2f3309f1de4 [diff] | |
| parent | b8f656b325adfbe1feb2ec762ae46bda0d53854c [diff] |
Merge "You can now specify a custom display size as NxM."
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 @@ } break; } - if (++name > 31) + if (++name >= SharedBufferStack::NUM_LAYERS_MAX) name = NO_MEMORY; } while(name >= 0);