commit 2935f6227d484ab1ac28f97cc19aab6e6fba8df7
author Matt Buckley <mattbuckley@google.com> Thu Jul 28 22:41:01 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 28 22:41:01 2022 +0000
tree 647a8ea371c2d631e418ad0769074f529e1a5709
parent 7c954b02043fb71f406f912883a99f61629c5037
parent 6e76e4ffff2282a84bc3e728a46c3cebcfce4273

Merge "Add null check in PowerAdvisor::supportsPowerHintSession" into tm-qpr-dev

services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp

diff --git a/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp b/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp
index 77dda6c..b9d4753 100644
--- a/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp
+++ b/services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp
@@ -187,7 +187,7 @@
     if (!mSupportsPowerHint.has_value()) {
         std::lock_guard lock(mPowerHalMutex);
         HalWrapper* const halWrapper = getPowerHal();
-        mSupportsPowerHint = halWrapper->supportsPowerHintSession();
+        mSupportsPowerHint = halWrapper && halWrapper->supportsPowerHintSession();
     }
     return *mSupportsPowerHint;
 }