commit bd340c7b492fcf7d0a6cccab8825e710c83fe76d
author Jamie Gennis <jgennis@google.com> Fri Mar 18 17:36:51 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 18 17:36:51 2011 -0700
tree bc74a5c7e4987377ecff34d474be2cc613ffc65f
parent cfb05dc67e4fd8c0c078d31bf5404ad915b80030
parent b368f4d85d8b5e567f605c991a6c5c6ff1c868d8

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

* commit 'b368f4d85d8b5e567f605c991a6c5c6ff1c868d8':
  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);
         }
     }