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

Commit 1ae49e3f authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Remove unused "layer" argument from show()." into jb-mr1-dev

parents e310c394 380223bf

include/gui/Surface.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public: 
    status_t    setPosition(int32_t x, int32_t y);

    status_t    setSize(uint32_t w, uint32_t h);

    status_t    hide();

    status_t    show(int32_t layer = -1);

    status_t    show();

    status_t    setFlags(uint32_t flags, uint32_t mask);

    status_t    setTransparentRegionHint(const Region& transparent);

    status_t    setAlpha(float alpha=1.0f);

include/gui/SurfaceComposerClient.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public: 
    static void closeGlobalTransaction(bool synchronous = false);



    status_t    hide(SurfaceID id);

    status_t    show(SurfaceID id, int32_t layer = -1);

    status_t    show(SurfaceID id);

    status_t    setFlags(SurfaceID id, uint32_t flags, uint32_t mask);

    status_t    setTransparentRegionHint(SurfaceID id, const Region& transparent);

    status_t    setLayer(SurfaceID id, int32_t layer);

libs/gui/Surface.cpp

+2 −2
Original line number Diff line number Diff line
@@ -122,11 +122,11 @@ status_t SurfaceControl::hide() { 
    const sp<SurfaceComposerClient>& client(mClient);

    return client->hide(mToken);

}

status_t SurfaceControl::show(int32_t layer) {

status_t SurfaceControl::show() {

    status_t err = validate();

    if (err < 0) return err;

    const sp<SurfaceComposerClient>& client(mClient);

    return client->show(mToken, layer);

    return client->show(mToken);

}

status_t SurfaceControl::setFlags(uint32_t flags, uint32_t mask) {

    status_t err = validate();

libs/gui/SurfaceComposerClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ status_t SurfaceComposerClient::hide(SurfaceID id) { 
            layer_state_t::eLayerHidden);

}



status_t SurfaceComposerClient::show(SurfaceID id, int32_t) {

status_t SurfaceComposerClient::show(SurfaceID id) {

    return getComposer().setFlags(this, id,

            0,

            layer_state_t::eLayerHidden);