commit fd64fd94e8f6c8b18428f690d696d00e0355a601
author Peiyong Lin <lpy@google.com> Fri Apr 05 20:16:39 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 05 20:16:39 2019 -0700
tree 979b78cbddc2a1fd3426effa4dd3d06073c687c9
parent ec152af5e3d72073a04e707f653a5bcdd712d31f
parent db6e8adc7c03194bf2bb8a8988cf7227ee82d16a

Merge "Avoid sending powerhint right after GPU composition." into qt-dev am: 2bbf60ab1d
am: db6e8adc7c

Change-Id: I1e065e960ce6bf6472661133de1a3ee3b1836c25

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index fccd910..0dc99bf 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3402,9 +3402,8 @@
         renderEngine.drawLayers(clientCompositionDisplay, clientCompositionLayers,
                                 buf->getNativeBuffer(), /*useFramebufferCache=*/true, std::move(fd),
                                 readyFence);
-        if (expensiveRenderingExpected && displayId) {
-            mPowerAdvisor.setExpensiveRenderingExpected(*displayId, false);
-        }
+    } else if (displayId) {
+        mPowerAdvisor.setExpensiveRenderingExpected(*displayId, false);
     }
     return true;
 }