diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-03 00:31:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-03 00:31:01 +0000 |
commit | a4e15b05b5b8e50cd5008f777bb719475ea3d955 (patch) | |
tree | 76290b267a0abdb765202f2d43e12baabf295aa8 | |
parent | 6d84411a54a84b3dbb5739f864baff75f60d0000 (diff) | |
parent | 8193497f4f3e2ed3ec21ea5489f38c2317147e2f (diff) | |
download | native-a4e15b05b5b8e50cd5008f777bb719475ea3d955.tar.gz |
Merge "[SurfaceFlinger] Avoid querying Power HAL until switching color mode." into pi-dev
-rw-r--r-- | services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp b/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp index 0e4ad91045..12bbae207b 100644 --- a/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp +++ b/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp @@ -45,13 +45,12 @@ void PowerAdvisor::setExpensiveRenderingExpected(hwc2_display_t displayId, bool 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, |