am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread

* commit '919853ce244f853966817d4adb2f3b7b6e4bbe74':
  Prevent SurfaceFlinger from using layer token 31.
This commit is contained in:
Jamie Gennis
2011-02-27 15:44:36 -08:00
committed by Android Git Automerger

View File

@@ -2427,7 +2427,7 @@ ssize_t UserClient::getTokenForSurface(const sp<ISurface>& sur) const
} }
break; break;
} }
if (++name > 31) if (++name >= SharedBufferStack::NUM_LAYERS_MAX)
name = NO_MEMORY; name = NO_MEMORY;
} while(name >= 0); } while(name >= 0);