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

Commit 94c7d3d9 authored by Robert Carr's avatar Robert Carr
Browse files

SurfaceFlinger: Only update client parent if set. 

We use the idea of client with parents to allow applications
to access SurfaceFlinger as long as they have an original "root"
Surface granted to them from the WindowManager. Sometimes the WindowManager
may reparent these child surfaces to a new surface, and so we need to update
which Surface is providing this grant. However, if a client never had a root
surface and is instead relying on ACCESS_SURFACE_FLINGER, e.g. the WindowManager
we need to not reparent or we may end up making the client invalid when
the Surface dies when we never intended to.

Bug: 78301580
Bug: 62536731
Test: Manual repro of b/78301580
Change-Id: Ib18cfe86e1cec3da7808fcd01e2b7ce02bebff6d
parent d3898410

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;