Merge "Check that ISystemSuspend is declared before acquiring a wake lock" into main am: c315f49b2e

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2870803

Change-Id: Ibe65e62a2ebbb8a98ffc540e7d2862e6456cdfd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/power.cpp b/power.cpp
index 98ce861..6041207 100644
--- a/power.cpp
+++ b/power.cpp
@@ -40,8 +40,15 @@ static std::unordered_map<std::string, std::shared_ptr<IWakeLock>> gWakeLockMap;
 
 static const std::shared_ptr<ISystemSuspend> getSystemSuspendServiceOnce() {
     static std::shared_ptr<ISystemSuspend> suspendService =
-        ISystemSuspend::fromBinder(ndk::SpAIBinder(AServiceManager_waitForService(
-            (ISystemSuspend::descriptor + std::string("/default")).c_str())));
+        []() -> std::shared_ptr<ISystemSuspend> {
+        std::string suspendServiceName =
+            ISystemSuspend::descriptor + std::string("/default");
+        if (!AServiceManager_isDeclared(suspendServiceName.c_str())) {
+            return nullptr;
+        }
+        return ISystemSuspend::fromBinder(ndk::SpAIBinder(
+            AServiceManager_waitForService(suspendServiceName.c_str())));
+    }();
     return suspendService;
 }