commit a4e15b05b5b8e50cd5008f777bb719475ea3d955
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 03 00:31:01 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 03 00:31:01 2018 +0000
tree 76290b267a0abdb765202f2d43e12baabf295aa8
parent 6d84411a54a84b3dbb5739f864baff75f60d0000
parent 8193497f4f3e2ed3ec21ea5489f38c2317147e2f

Merge "[SurfaceFlinger] Avoid querying Power HAL until switching color mode." into pi-dev

services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp

diff --git a/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp b/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp
index 0e4ad91..12bbae2 100644
--- a/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp
+++ b/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp
@@ -45,13 +45,12 @@
         mExpensiveDisplays.erase(displayId);
     }
 
-    const sp<V1_3::IPower> powerHal = getPowerHal();
-    if (powerHal == nullptr) {
-        return;
-    }
-
     const bool expectsExpensiveRendering = !mExpensiveDisplays.empty();
     if (mNotifiedExpensiveRendering != expectsExpensiveRendering) {
+        const sp<V1_3::IPower> powerHal = getPowerHal();
+        if (powerHal == nullptr) {
+            return;
+        }
         auto ret = powerHal->powerHintAsync_1_3(PowerHint::EXPENSIVE_RENDERING,
                                                 expectsExpensiveRendering);
         // If Power HAL 1.3 was available previously but now fails,