Merge "Add Consumer name in Surface::dequeueBuffer trace"

#include <android/gui/DisplayStatInfo.h>

#include <android/native_window.h>

#include <gui/TraceUtils.h>

#include <utils/Log.h>

#include <utils/Trace.h>

#include <utils/NativeHandle.h>

#include <utils/Trace.h>

#include <ui/DynamicDisplayInfo.h>

#include <ui/Fence.h>

}

int Surface::dequeueBuffer(android_native_buffer_t** buffer, int* fenceFd) {

    ATRACE_CALL();

    ATRACE_FORMAT("dequeueBuffer - %s", getDebugName());

    ALOGV("Surface::dequeueBuffer");

    IGraphicBufferProducer::DequeueBufferInput dqInput;

    mSurfaceControlHandle = nullptr;

}

const char* Surface::getDebugName() {

    std::unique_lock lock{mNameMutex};

    if (mName.empty()) {

        mName = getConsumerName();

    }

    return mName.c_str();

}

}; // namespace android

    int dispatchGetLastQueuedBuffer2(va_list args);

    int dispatchSetFrameTimelineInfo(va_list args);

    std::mutex mNameMutex;

    std::string mName;

    const char* getDebugName();

protected:

    virtual int dequeueBuffer(ANativeWindowBuffer** buffer, int* fenceFd);

    virtual int cancelBuffer(ANativeWindowBuffer* buffer, int fenceFd);