commit 6541fe56f139c3d135bfa8d9afe01320a88e4cff
author Peiyong Lin <lpy@google.com> Mon Jul 02 18:01:29 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 02 18:01:29 2018 -0700
tree f4be5532b6e79f9af72b0f4a6b0d19cd05b85a59
parent 9b0b687c1c97d8b8acd090604c327b726dcc26c8
parent 4e63106e26cd09b38bb18a451f5b747b63063298

Merge "[SurfaceFlinger] Avoid querying Power HAL until switching color mode." into pi-dev am: a4e15b05b5
am: 4e63106e26

Change-Id: Ia561df91a3661cc5cf425c376f9a5155d5a0162a

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,