commit 6929fc9f1a0e1e0054c5018e1dc8ee5d6be0c4a8
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 15 06:57:29 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 15 06:57:29 2023 +0000
tree 1a9a510d09b899a6e50766a0c8413d47260af50a
parent 0afb83f5956914086e73df2572ff1d781b9ef19e
parent fa58ead2cb93ab6a54c91f36992a340b0af7d5a0

Merge "Check AServiceManager_isDeclared before AServiceManager_getService" am: fa58ead2cb

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2623413

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

gatekeeperd/gatekeeperd.cpp

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index 7987167..bdfb7f6 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -63,9 +63,13 @@
 
 GateKeeperProxy::GateKeeperProxy() {
     clear_state_if_needed_done = false;
-    hw_device = IGatekeeper::getService();
-    ::ndk::SpAIBinder ks2Binder(AServiceManager_getService(gatekeeperServiceName));
-    aidl_hw_device = AidlIGatekeeper::fromBinder(ks2Binder);
+    if (AServiceManager_isDeclared(gatekeeperServiceName)) {
+        ::ndk::SpAIBinder ks2Binder(AServiceManager_waitForService(gatekeeperServiceName));
+        aidl_hw_device = AidlIGatekeeper::fromBinder(ks2Binder);
+    }
+    if (!aidl_hw_device) {
+        hw_device = IGatekeeper::getService();
+    }
     is_running_gsi = android::base::GetBoolProperty(android::gsi::kGsiBootedProp, false);
 
     if (!aidl_hw_device && !hw_device) {