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

* commit 'bd340c7b492fcf7d0a6cccab8825e710c83fe76d':
  SurfaceFlinger: Fix a typo.
This commit is contained in:
Jamie Gennis 2011-03-18 17:38:37 -07:00 committed by Android Git Automerger
commit 3eb70b4a51
1 changed files with 1 additions and 1 deletions

View File

@ -811,7 +811,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);
}
}