commit db6e8adc7c03194bf2bb8a8988cf7227ee82d16a
author Peiyong Lin <lpy@google.com> Fri Apr 05 17:47:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 05 17:47:31 2019 -0700
tree 4da92fe6b24bf5a832943adb2c700377f1564078
parent 24a05e014dfcdb868763947d872f9bc4efa6a2f7
parent 2bbf60ab1deb650f8164b734916f80bb4183f22b

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

Change-Id: I39414dec8b1f907becc0ad48abf4de8df75f9fcb

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;
 }