Merge "libaudiohal@aidl: Add missing HAL death handler" into main (d9dc7d27) · Commits · e / os / android_frameworks_av

media/libaudiohal/impl/AidlUtils.cpp

0 → 100644

+47 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2024 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			#include "AidlUtils.h"

			#define LOG_TAG "AIDLUtils"
			#include <utils/Log.h>

			namespace android {

			//static
			HalDeathHandler& HalDeathHandler::getInstance() {
			// never-delete singleton
			static HalDeathHandler* instance = new HalDeathHandler;
			return *instance;
			}

			//static
			void HalDeathHandler::OnBinderDied(void*) {
			ALOGE("HAL instance died, audio server is restarting");
			_exit(1); // Avoid calling atexit handlers, as this code runs on a thread from RPC threadpool.
			}

			HalDeathHandler::HalDeathHandler()
			: mDeathRecipient(AIBinder_DeathRecipient_new(OnBinderDied)) {}

			bool HalDeathHandler::registerHandler(AIBinder* binder) {
			binder_status_t status = AIBinder_linkToDeath(binder, mDeathRecipient.get(), nullptr);
			if (status == STATUS_OK) return true;
			ALOGE("%s: linkToDeath failed: %d", __func__, status);
			return false;
			}

			} // namespace android

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,10 +20,24 @@
	#include <string>		#include <string>

	#include <android/binder_auto_utils.h>		#include <android/binder_auto_utils.h>
			#include <android/binder_ibinder.h>
	#include <android/binder_manager.h>		#include <android/binder_manager.h>

	namespace android {		namespace android {

			class HalDeathHandler {
			public:
			static HalDeathHandler& getInstance();

			bool registerHandler(AIBinder* binder);
			private:
			static void OnBinderDied(void*);

			HalDeathHandler();

			::ndk::ScopedAIBinder_DeathRecipient mDeathRecipient;
			};

	template<class Intf>		template<class Intf>
	std::shared_ptr<Intf> getServiceInstance(const std::string& instanceName) {		std::shared_ptr<Intf> getServiceInstance(const std::string& instanceName) {
	const std::string serviceName =		const std::string serviceName =
	@@ -37,6 +51,9 @@ std::shared_ptr<Intf> getServiceInstance(const std::string& instanceName) {
	}		}
	// `fromBinder` may fail and return a nullptr if the service has died in the meantime.		// `fromBinder` may fail and return a nullptr if the service has died in the meantime.
	service = Intf::fromBinder(ndk::SpAIBinder(serviceBinder));		service = Intf::fromBinder(ndk::SpAIBinder(serviceBinder));
			if (service != nullptr) {
			HalDeathHandler::getInstance().registerHandler(serviceBinder);
			}
	}		}
	return service;		return service;
	}		}

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -262,6 +262,7 @@ cc_library_shared {
	srcs: [		srcs: [
	":audio_effect_hal_aidl_src_files",		":audio_effect_hal_aidl_src_files",
	":core_audio_hal_aidl_src_files",		":core_audio_hal_aidl_src_files",
			"AidlUtils.cpp",
	"DevicesFactoryHalEntry.cpp",		"DevicesFactoryHalEntry.cpp",
	"EffectsFactoryHalEntry.cpp",		"EffectsFactoryHalEntry.cpp",
	],		],