diff options
author | Jamie Gennis <jgennis@google.com> | 2011-03-18 17:32:25 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-18 17:32:25 -0700 |
commit | d32a694a0c2040e1cc03ec0172d5378b78363fa5 (patch) | |
tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /services/surfaceflinger | |
parent | b36926abde8e751f23a553b720d27939c3df994e (diff) | |
parent | 5fd799dab602850b384d124c61096636f0988a93 (diff) | |
download | frameworks_native-d32a694a0c2040e1cc03ec0172d5378b78363fa5.zip frameworks_native-d32a694a0c2040e1cc03ec0172d5378b78363fa5.tar.gz frameworks_native-d32a694a0c2040e1cc03ec0172d5378b78363fa5.tar.bz2 |
Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
Diffstat (limited to 'services/surfaceflinger')
-rw-r--r-- | services/surfaceflinger/Layer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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); } } |