Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 560fe009 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

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

* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
  SurfaceFlinger: Fix a typo.
parents bd7b09f8 d32a694a

services/surfaceflinger/Layer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }