diff options
author | Alec Mouri <alecmouri@google.com> | 2019-08-23 19:43:37 -0700 |
---|---|---|
committer | Alec Mouri <alecmouri@google.com> | 2019-09-06 11:44:52 -0700 |
commit | 672e9b0ce6f604ad3162f1c83524da97f9a0ed33 (patch) | |
tree | 0e1aafd3e507f029c94815c5568e1f1cb6eb80bf /libs/hwui/renderthread | |
parent | 8d0c5bd2006118af9d27813b608f35ce901695c9 (diff) |
[HWUI] Use ANativeWindow_setDequeueTimeout
Don't use the ReliableSurface version now that we have an APEX stub.
Bug: 137012798
Test: builds
Change-Id: I63d1d9d2ff60b54a75d5b4865a63eb22ac347208
Diffstat (limited to 'libs/hwui/renderthread')
-rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 2 | ||||
-rw-r--r-- | libs/hwui/renderthread/ReliableSurface.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index b5ef8f43dfb6..684dc22ee4d1 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -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; diff --git a/libs/hwui/renderthread/ReliableSurface.h b/libs/hwui/renderthread/ReliableSurface.h index 0d251b1f10e7..f768df37ba7d 100644 --- a/libs/hwui/renderthread/ReliableSurface.h +++ b/libs/hwui/renderthread/ReliableSurface.h @@ -31,8 +31,6 @@ public: ReliableSurface(sp<Surface>&& surface); ~ReliableSurface(); - void setDequeueTimeout(nsecs_t timeout) { mSurface->setDequeueTimeout(timeout); } - int reserveNext(); void allocateBuffers() { mSurface->allocateBuffers(); } |