commit 2ada5b865d7877ed854fe43c67df96c2d9c73596
author Jamie Gennis <jgennis@google.com> Fri Mar 18 17:38:37 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 18 17:38:37 2011 -0700
tree 89d5e0d8d0753b4f974924390fca1e43cbb91036
parent a3d17a753d073b1f7425a495a17dec438c6894cd
parent bd340c7b492fcf7d0a6cccab8825e710c83fe76d

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

* commit 'bd340c7b492fcf7d0a6cccab8825e710c83fe76d':
  SurfaceFlinger: Fix a typo.

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 78ee07e..c4027e0 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -811,7 +811,7 @@
 
     { // scope for strong mUserClient reference
         sp<UserClient> userClient(mUserClient.promote());
-        if (mUserClient != 0 && mControlBlock != 0) {
+        if (userClient != 0 && mControlBlock != 0) {
             mControlBlock->setStatus(NO_INIT);
         }
     }