Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread

Jamie Gennis · Android (Google) Code Review · commit 919853ce244f · 2011-02-27T15:27:22.000-08:00
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -2427,7 +2427,7 @@ ssize_t UserClient::getTokenForSurface(const sp<ISurface>& sur) const`
`2427`	`2427`	`}`
`2428`	`2428`	`break;`
`2429`	`2429`	`}`
`2430`		`- if (++name > 31)`
	`2430`	`+ if (++name >= SharedBufferStack::NUM_LAYERS_MAX)`
`2431`	`2431`	`name = NO_MEMORY;`
`2432`	`2432`	`} while(name >= 0);`
`2433`	`2433`