commit 9fc2805c06212bd17b31e477f4dbd6aa2d6f18c4
author Ady Abraham <adyabr@google.com> Thu Oct 14 17:21:38 2021 -0700
committer Ady Abraham <adyabr@google.com> Tue Oct 19 10:43:28 2021 -0700
tree 5aa8e6a2ce022d4ad2497839bb02cfb5927c2861
parent e7385f747c36857c46e42fe882d74cf374ad8cfa

SF: split ComposerHal to Hidl/Aidl files

Bug: 198690444
Test: build
Change-Id: I6b39e58f53065a04b4e6bb5426ae329b25a1dadb

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

diff --git a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
index 0a8cf5b..ba57be5 100644
--- a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
+++ b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
@@ -18,7 +18,7 @@
 #define LOG_TAG "HwcComposer"
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 
-#include "ComposerHal.h"
+#include "AidlComposerHal.h"
 
 #include <android/binder_ibinder_platform.h>
 #include <android/binder_manager.h>
@@ -218,12 +218,18 @@
     sp<V2_4::IComposerCallback> mCallback;
 };
 
-namespace impl {
+std::string AidlComposer::instance(const std::string& serviceName) {
+    return std::string(AidlIComposer::descriptor) + "/" + serviceName;
+}
+
+bool AidlComposer::isDeclared(const std::string& serviceName) {
+    return AServiceManager_isDeclared(instance(serviceName).c_str());
+}
 
 AidlComposer::AidlComposer(const std::string& serviceName) : mWriter(kWriterInitialSize) {
     // This only waits if the service is actually declared
-    mAidlComposer = AidlIComposer::fromBinder(ndk::SpAIBinder(
-            AServiceManager_waitForService((AidlIComposer::descriptor + serviceName).c_str())));
+    mAidlComposer = AidlIComposer::fromBinder(
+            ndk::SpAIBinder(AServiceManager_waitForService(instance(serviceName).c_str())));
     if (!mAidlComposer) {
         LOG_ALWAYS_FATAL("Failed to get AIDL composer service");
         return;
@@ -263,7 +269,7 @@
     if (mAidlComposerCallback) {
         ALOGE("Callback already registered");
     }
-    mAidlComposerCallback = std::make_shared<AidlIComposerCallbackWrapper>(callback);
+    mAidlComposerCallback = ndk::SharedRefBase::make<AidlIComposerCallbackWrapper>(callback);
     AIBinder_setMinSchedulerPolicy(mAidlComposerCallback->asBinder().get(), SCHED_FIFO, 2);
 
     const auto status = mAidlComposerClient->registerCallback(mAidlComposerCallback);
@@ -1361,6 +1367,5 @@
     *outClientTargetProperty = data.clientTargetProperty;
 }
 
-} // namespace impl
 } // namespace Hwc2
 } // namespace android