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

Commit c531b0ee authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SurfaceFlinger: Only update client parent if set." into pi-dev

parents e43650d2 94c7d3d9

services/surfaceflinger/Client.cpp

+7 −2
Original line number Diff line number Diff line
@@ -65,10 +65,15 @@ Client::~Client() 
    }

}



void Client::setParentLayer(const sp<Layer>& parentLayer) {

void Client::updateParent(const sp<Layer>& parentLayer) {

    Mutex::Autolock _l(mLock);



    // If we didn't ever have a parent, then we must instead be

    // relying on permissions and we never need a parent.

    if (mParentLayer != nullptr) {

        mParentLayer = parentLayer;

    }

}



sp<Layer> Client::getParentLayer(bool* outParentDied) const {

    Mutex::Autolock _l(mLock);

services/surfaceflinger/Client.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public: 


    sp<Layer> getLayerUser(const sp<IBinder>& handle) const;



    void setParentLayer(const sp<Layer>& parentLayer);

    void updateParent(const sp<Layer>& parentLayer);



private:

    // ISurfaceComposerClient interface

services/surfaceflinger/Layer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1589,7 +1589,7 @@ bool Layer::reparentChildren(const sp<IBinder>& newParentHandle) { 


        sp<Client> client(child->mClientRef.promote());

        if (client != nullptr) {

            client->setParentLayer(newParent);

            client->updateParent(newParent);

        }

    }

    mCurrentChildren.clear();
@@ -1625,7 +1625,7 @@ bool Layer::reparent(const sp<IBinder>& newParentHandle) { 
    sp<Client> newParentClient(newParent->mClientRef.promote());



    if (client != newParentClient) {

        client->setParentLayer(newParent);

        client->updateParent(newParent);

    }



    return true;