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

Commit 5d76d441 authored by Alec Mouri's avatar Alec Mouri Committed by Android (Google) Code Review
Browse files

Merge "[HWUI] Use ANativeWindow_setDequeueTimeout"

parents c12ee77b 672e9b0c

libs/hwui/renderthread/CanvasContext.cpp

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ void CanvasContext::setSurface(sp<Surface>&& surface) { 
    if (surface) {

        mNativeSurface = new ReliableSurface{std::move(surface)};

        // TODO: Fix error handling & re-shorten timeout

        mNativeSurface->setDequeueTimeout(4000_ms);

        ANativeWindow_setDequeueTimeout(mNativeSurface.get(), 4000_ms);

        mNativeSurface->enableFrameTimestamps(true);

    } else {

        mNativeSurface = nullptr;

libs/hwui/renderthread/ReliableSurface.h

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ public: 
    ReliableSurface(sp<Surface>&& surface);

    ~ReliableSurface();



    void setDequeueTimeout(nsecs_t timeout) { mSurface->setDequeueTimeout(timeout); }



    int reserveNext();



    void allocateBuffers() { mSurface->allocateBuffers(); }