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

* commit 'b368f4d85d8b5e567f605c991a6c5c6ff1c868d8':
  SurfaceFlinger: Fix a typo.
This commit is contained in:
Jamie Gennis 2011-03-18 17:36:51 -07:00 committed by Android Git Automerger
commit 09bb22afae

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);
}
}