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

Commit eaac2761 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 64f7549b: Merge "fix [2712278] The preview buffer left some black borders... 

am 64f7549b: Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken
parents 393f5698 64f7549b

include/private/surfaceflinger/SharedBufferStack.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ public: 
    SharedBufferBase(SharedClient* sharedClient, int surface,

            int32_t identity);

    ~SharedBufferBase();

    uint32_t getIdentity();

    status_t getStatus() const;

    size_t getFrontBuffer() const;

    String8 dump(char const* prefix) const;

include/surfaceflinger/Surface.h

+2 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ private: 
     */

    void init();

    status_t validate() const;

    sp<SurfaceComposerClient> getClient() const;

    status_t initCheck() const;

    sp<ISurface> getISurface() const;



    inline const GraphicBufferMapper& getBufferMapper() const { return mBufferMapper; }
@@ -271,6 +271,7 @@ private: 
    uint32_t                    mFlags;

    GraphicBufferMapper&        mBufferMapper;

    SharedBufferClient*         mSharedBufferClient;

    status_t                    mInitCheck;



    // protected by mSurfaceLock

    Rect                        mSwapRectangle;

include/surfaceflinger/SurfaceComposerClient.h

+10 −13
Original line number Diff line number Diff line
@@ -123,13 +123,6 @@ public: 
    status_t linkToComposerDeath(const sp<IBinder::DeathRecipient>& recipient,

            void* cookie = NULL, uint32_t flags = 0);



private:

    friend class Surface;

    friend class SurfaceControl;

    

    SurfaceComposerClient(const sp<ISurfaceComposer>& sm, 

            const sp<IBinder>& conn);



    status_t    hide(SurfaceID id);

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

    status_t    freeze(SurfaceID id);
@@ -142,17 +135,21 @@ private: 
    status_t    setMatrix(SurfaceID id, float dsdx, float dtdx, float dsdy, float dtdy);

    status_t    setPosition(SurfaceID id, int32_t x, int32_t y);

    status_t    setSize(SurfaceID id, uint32_t w, uint32_t h);

    

    void        signalServer();



    status_t    destroySurface(SurfaceID sid);



    void        _init(const sp<ISurfaceComposer>& sm,

    SharedClient*   getSharedClient() const;



private:

    SurfaceComposerClient(const sp<ISurfaceComposer>& sm,

            const sp<IBinder>& conn);



    void        init(const sp<ISurfaceComposer>& sm,

                    const sp<ISurfaceFlingerClient>& conn);



    inline layer_state_t*   _get_state_l(SurfaceID id);

    layer_state_t*          _lockLayerState(SurfaceID id);

    inline void             _unlockLayerState();

    inline layer_state_t*   get_state_l(SurfaceID id);

    layer_state_t*          lockLayerState(SurfaceID id);

    inline void             unlockLayerState();



    mutable     Mutex                               mLock;

                layer_state_t*                      mPrebuiltLayerState;

libs/surfaceflinger/LayerBase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ void LayerBase::dump(String8& result, char* buffer, size_t SIZE) const 


// ---------------------------------------------------------------------------



int32_t LayerBaseClient::sIdentity = 0;

int32_t LayerBaseClient::sIdentity = 1;



LayerBaseClient::LayerBaseClient(SurfaceFlinger* flinger, DisplayID display,

        const sp<Client>& client, int32_t i)

libs/surfaceflinger_client/SharedBufferStack.cpp

+0 −6
Original line number Diff line number Diff line
@@ -155,12 +155,6 @@ SharedBufferBase::~SharedBufferBase() 
{

}



uint32_t SharedBufferBase::getIdentity()

{

    SharedBufferStack& stack( *mSharedStack );

    return stack.identity;

}



status_t SharedBufferBase::getStatus() const

{

    SharedBufferStack& stack( *mSharedStack );