commit d8f2441693ce6c9abf4891a5163be7dcdba455d4
author Mikhail Naganov <mnaganov@google.com> Wed Mar 20 18:15:42 2024 -0700
committer Mikhail Naganov <mnaganov@google.com> Wed Mar 20 18:15:42 2024 -0700
tree cddd25adc79bad2702803d34adbf54bfddd27b81
parent f3f2c24b8ebf7c7839daed1abccb7a39ccbd1220

libaudiohal: Handle failures of 'waitForService' and 'fromBinder'

Both 'waitForService' and 'fromBinder' may unexpectedly
return a nullptr on various transient failures. Since
we anyway plan to wait forever in 'waitForService',
implement retry logic to avoid crashing audioserver.

Bug: 330417729
Test: atest VtsHalAudioCoreTargetTest
Change-Id: Iecff8a7a0dffdb80009d26857cefd93d1c996d58

media/libaudiohal/impl/DevicesFactoryHalAidl.cpp

diff --git a/media/libaudiohal/impl/DevicesFactoryHalAidl.cpp b/media/libaudiohal/impl/DevicesFactoryHalAidl.cpp
index 347afa6..68b650f 100644
--- a/media/libaudiohal/impl/DevicesFactoryHalAidl.cpp
+++ b/media/libaudiohal/impl/DevicesFactoryHalAidl.cpp
@@ -31,6 +31,7 @@
 #include <media/AidlConversionUtil.h>
 #include <utils/Log.h>
 
+#include "AidlUtils.h"
 #include "DeviceHalAidl.h"
 #include "DevicesFactoryHalAidl.h"
 
@@ -179,16 +180,8 @@
     if (name == nullptr || device == nullptr) {
         return BAD_VALUE;
     }
-    std::shared_ptr<IModule> service;
     if (strcmp(name, "primary") == 0) name = "default";
-    auto serviceName = std::string(IModule::descriptor) + "/" + name;
-    service = IModule::fromBinder(
-            ndk::SpAIBinder(AServiceManager_waitForService(serviceName.c_str())));
-    if (service == nullptr) {
-        ALOGE("%s fromBinder %s failed", __func__, serviceName.c_str());
-        return NO_INIT;
-    }
-    *device = sp<DeviceHalAidl>::make(name, service, mVendorExt);
+    *device = sp<DeviceHalAidl>::make(name, getServiceInstance<IModule>(name), mVendorExt);
     return OK;
 }
 
@@ -229,14 +222,7 @@
 
 // Main entry-point to the shared library.
 extern "C" __attribute__((visibility("default"))) void* createIDevicesFactoryImpl() {
-    auto serviceName = std::string(IConfig::descriptor) + "/default";
-    auto service = IConfig::fromBinder(
-            ndk::SpAIBinder(AServiceManager_waitForService(serviceName.c_str())));
-    if (!service) {
-        ALOGE("%s binder service %s not exist", __func__, serviceName.c_str());
-        return nullptr;
-    }
-    return new DevicesFactoryHalAidl(service);
+    return new DevicesFactoryHalAidl(getServiceInstance<IConfig>("default"));
 }
 
 } // namespace android