commit 1a4bce99179f19ba356262ce50497d41726f717e
author Kevin DuBois <kevindubois@google.com> Fri May 10 15:08:10 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 10 15:08:10 2019 +0000
tree 80c5e295b423e5523b7f04a57104d96649996068
parent 72da70aca485e015fbb6c42c49c2b8dd6086aec3
parent f802abe47f5bafd617ab64c2330a3d1827a4f95c

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

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index f326ce8..8551234 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -153,7 +153,8 @@
         mNativeSurface = nullptr;
     }
 
-    if (mRenderAheadDepth == 0 && DeviceInfo::get()->getMaxRefreshRate() > 66.6f) {
+    if (mRenderAheadDepth == 0 && DeviceInfo::get()->getMaxRefreshRate() > 66.6f &&
+            !mFixedRenderAhead) {
         mFixedRenderAhead = false;
         mRenderAheadCapacity = 1;
     } else {