Merge changes from topic "fix-b-149854039-dynamic-hal-modules" am: 20b97e9e0b (a0c27243) · Commits · e / os / android_frameworks_av

media/libaudioclient/AudioSystem.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -783,6 +783,13 @@ const sp<IAudioPolicyService> AudioSystem::get_audio_policy_service()

		// ---------------------------------------------------------------------------

		void AudioSystem::onNewAudioModulesAvailable()
		{
		const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
		if (aps == 0) return;
		aps->onNewAudioModulesAvailable();
		}

		status_t AudioSystem::setDeviceConnectionState(audio_devices_t device,
		audio_policy_dev_state_t state,
		const char *device_address,

+16 −1

Original line number	Diff line number	Diff line
		@@ -108,6 +108,7 @@ enum {
		SET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY,
		REMOVE_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY,
		GET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY,
		AUDIO_MODULES_UPDATED, // oneway
		};

		#define MAX_ITEMS_PER_LIST 1024
		@@ -1336,6 +1337,13 @@ public:
		}
		return static_cast<status_t>(reply.readInt32());
		}

		virtual void onNewAudioModulesAvailable()
		{
		Parcel data, reply;
		data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
		remote()->transact(AUDIO_MODULES_UPDATED, data, &reply, IBinder::FLAG_ONEWAY);
		}
		};

		IMPLEMENT_META_INTERFACE(AudioPolicyService, "android.media.IAudioPolicyService");
		@@ -1401,7 +1409,8 @@ status_t BnAudioPolicyService::onTransact(
		case SET_RTT_ENABLED:
		case SET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:
		case REMOVE_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:
		case GET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY: {
		case GET_PREFERRED_DEVICE_FOR_PRODUCT_STRATEGY:
		case AUDIO_MODULES_UPDATED: {
		if (!isServiceUid(IPCThreadState::self()->getCallingUid())) {
		ALOGW("%s: transaction %d received from PID %d unauthorized UID %d",
		__func__, code, IPCThreadState::self()->getCallingPid(),
		@@ -2458,6 +2467,12 @@ status_t BnAudioPolicyService::onTransact(
		return NO_ERROR;
		}

		case AUDIO_MODULES_UPDATED: {
		CHECK_INTERFACE(IAudioPolicyService, data, reply);
		onNewAudioModulesAvailable();
		return NO_ERROR;
		} break;

		default:
		return BBinder::onTransact(code, data, reply, flags);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -211,6 +211,7 @@ public:
		//
		// IAudioPolicyService interface (see AudioPolicyInterface for method descriptions)
		//
		static void onNewAudioModulesAvailable();
		static status_t setDeviceConnectionState(audio_devices_t device, audio_policy_dev_state_t state,
		const char device_address, const char device_name,
		audio_format_t encodedFormat);

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ public:
		//
		// IAudioPolicyService interface (see AudioPolicyInterface for method descriptions)
		//
		virtual void onNewAudioModulesAvailable() = 0;
		virtual status_t setDeviceConnectionState(audio_devices_t device,
		audio_policy_dev_state_t state,
		const char *device_address,

+17 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		#include <string>
		#include <sys/time.h>
		#include <sys/resource.h>
		#include <thread>

		#include <android/os/IExternalVibratorService.h>
		#include <binder/IPCThreadState.h>
		@@ -143,6 +144,19 @@ static sp<os::IExternalVibratorService> getExternalVibratorService() {
		return sExternalVibratorService;
		}

		class DevicesFactoryHalCallbackImpl : public DevicesFactoryHalCallback {
		public:
		void onNewDevicesAvailable() override {
		// Start a detached thread to execute notification in parallel.
		// This is done to prevent mutual blocking of audio_flinger and
		// audio_policy services during system initialization.
		std::thread notifier([]() {
		AudioSystem::onNewAudioModulesAvailable();
		});
		notifier.detach();
		}
		};

		// ----------------------------------------------------------------------------

		std::string formatToString(audio_format_t format) {
		@@ -221,6 +235,9 @@ void AudioFlinger::onFirstRef()
		mMode = AUDIO_MODE_NORMAL;

		gAudioFlinger = this;

		mDevicesFactoryHalCallback = new DevicesFactoryHalCallbackImpl;
		mDevicesFactoryHal->setCallbackOnce(mDevicesFactoryHalCallback);
		}

		status_t AudioFlinger::setAudioHalPids(const std::vector<pid_t>& pids) {