commit 6e76e4ffff2282a84bc3e728a46c3cebcfce4273
author Shao-Chuan Lee <shaochuan@google.com> Wed Jul 27 09:53:41 2022 +0900
committer Matt Buckley <mattbuckley@google.com> Thu Jul 28 19:12:30 2022 +0000
tree aab2e47f4d680724eb2764f577c86842bd849bbf
parent 901a5975bb2ee30e11f565959c945f27350ef2c0

Add null check in PowerAdvisor::supportsPowerHintSession

halWrapper can be null in some cases.

Bug: 240341302
Test: ARCVM boots
Change-Id: I768820c31f1ae8929851212f5ecb310e2b3a9098
(cherry picked from commit 65a2c197a4223528a51d13b64b0b6e03d0f65008)

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