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

Commit 0d69ad5d authored by Dave Burke's avatar Dave Burke Committed by The Android Automerger
Browse files

Revert "Change SurfaceControl setPosition to take floats" 

Temporary, to fix weekend build, until we get Nvidia code drop.

This reverts commit 9a867a87

DO NOT MERGE

Change-Id: I7b5dbc4db46ef3d97dc8598057d5487d6971178b
parent 4eef3878

include/gui/SurfaceControl.h

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

    status_t    setLayerStack(int32_t layerStack);

    status_t    setLayer(int32_t layer);

    status_t    setPosition(float x, float y);

    status_t    setPosition(int32_t x, int32_t y);

    status_t    setSize(uint32_t w, uint32_t h);

    status_t    hide();

    status_t    show();

libs/gui/SurfaceControl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ status_t SurfaceControl::setLayer(int32_t layer) { 
    const sp<SurfaceComposerClient>& client(mClient);

    return client->setLayer(mSurface, layer);

}

status_t SurfaceControl::setPosition(float x, float y) {

status_t SurfaceControl::setPosition(int32_t x, int32_t y) {

    status_t err = validate();

    if (err < 0) return err;

    const sp<SurfaceComposerClient>& client(mClient);