commit 560fe009e52ba945744c019ad477431f698f0c1b
author Jamie Gennis <jgennis@google.com> Fri Mar 18 17:34:27 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 18 17:34:27 2011 -0700
tree 2aa2cb6936c908494527967d2b865eaf6392b787
parent bd7b09f84128089720f64eef2d09ade494e9823f
parent d32a694a0c2040e1cc03ec0172d5378b78363fa5

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

* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
  SurfaceFlinger: Fix a typo.

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index cd24478..517c335 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -809,7 +809,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);
         }
     }