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

Commit 19f79f61 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add missing override" into sc-dev am: 757f24e3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15066428

Change-Id: I256c05c77ee1c6ad7eac7fa27ef49856662e85f2
parents ba2b3526 757f24e3

services/surfaceflinger/MonitoredProducer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -140,6 +140,11 @@ status_t MonitoredProducer::getLastQueuedBuffer(sp<GraphicBuffer>* outBuffer, 
            outTransformMatrix);

}



status_t MonitoredProducer::getLastQueuedBuffer(sp<GraphicBuffer>* outBuffer, sp<Fence>* outFence,

                                                Rect* outRect, uint32_t* outTransform) {

    return mProducer->getLastQueuedBuffer(outBuffer, outFence, outRect, outTransform);

}



void MonitoredProducer::getFrameTimestamps(FrameEventHistoryDelta* outDelta) {

    mProducer->getFrameTimestamps(outDelta);

}

services/surfaceflinger/MonitoredProducer.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ public: 
    virtual status_t setLegacyBufferDrop(bool drop) override;

    virtual status_t getLastQueuedBuffer(sp<GraphicBuffer>* outBuffer,

            sp<Fence>* outFence, float outTransformMatrix[16]) override;

    virtual status_t getLastQueuedBuffer(sp<GraphicBuffer>* outBuffer, sp<Fence>* outFence,

                                         Rect* outRect, uint32_t* outTransform) override;

    virtual IBinder* onAsBinder();

    virtual status_t setSharedBufferMode(bool sharedBufferMode) override;

    virtual status_t setAutoRefresh(bool autoRefresh) override;