Merge "hwui: ro.hwui.render_ahead=0 queue on high FPS" into qt-dev am: 1a4bce9917

am: 9dbdf928d9 Change-Id: I320250e16f1d6dccc00d27db48e56ba8299b6884
2019-05-10 18:28:37 -07:00
parent 524f2fd5a6 9dbdf928d9
commit 454dede911
1 changed files with 2 additions and 1 deletions
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -153,7 +153,8 @@ void CanvasContext::setSurface(sp<Surface>&& surface) {
        mNativeSurface = nullptr;
    }

-    if (mRenderAheadDepth == 0 && DeviceInfo::get()->getMaxRefreshRate() > 66.6f) {
+    if (mRenderAheadDepth == 0 && DeviceInfo::get()->getMaxRefreshRate() > 66.6f &&
+            !mFixedRenderAhead) {
        mFixedRenderAhead = false;
        mRenderAheadCapacity = 1;
    } else {