am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1

* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
  SurfaceFlinger: Fix a typo.
This commit is contained in:
Jamie Gennis 2011-03-18 17:34:27 -07:00 committed by Android Git Automerger
commit 560fe009e5

View File

@ -809,7 +809,7 @@ status_t Layer::ClientRef::setToken(const sp<UserClient>& uc,
{ // scope for strong mUserClient reference
sp<UserClient> userClient(mUserClient.promote());
if (mUserClient != 0 && mControlBlock != 0) {
if (userClient != 0 && mControlBlock != 0) {
mControlBlock->setStatus(NO_INIT);
}
}