Merge "Increase dequeueBuffer timeout" into qt-r1-dev

am: 5ab5cd7aa2 Change-Id: Ia32a0b1177a5e7160680e1d4c9c40ff23075c431
2019-07-22 12:34:30 -07:00
parent de7087b5b2 5ab5cd7aa2
commit 6769f25c17
1 changed files with 2 additions and 1 deletions
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -148,7 +148,8 @@ void CanvasContext::setSurface(sp<Surface>&& surface) {

    if (surface) {
        mNativeSurface = new ReliableSurface{std::move(surface)};
-        mNativeSurface->setDequeueTimeout(500_ms);
+        // TODO: Fix error handling & re-shorten timeout
+        mNativeSurface->setDequeueTimeout(4000_ms);
    } else {
        mNativeSurface = nullptr;
    }