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

Commit 2ada5b86 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

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

* commit 'bd340c7b':
  SurfaceFlinger: Fix a typo.
parents a3d17a75 bd340c7b

services/surfaceflinger/Layer.cpp

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

        }

    }