Merge "Increase dequeueBuffer timeout" into qt-r1-dev am: 5ab5cd7aa2

am: 6769f25c17 Change-Id: I13931cd14fead1141acbea5cef8deb61a6c9119e
2019-07-22 12:51:21 -07:00
parent 57e1e73bad 6769f25c17
commit 296c5ef20e
1 changed files with 2 additions and 1 deletions
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -145,7 +145,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;
    }