Implement use of Device.setConnectedState/_7_1 HAL method am: d7ba61d054 (9c7d7ce8) · Commits · e / os / android_frameworks_av

media/libaudioclient/IAudioFlinger.cpp

+12 −0

Original line number	Diff line number	Diff line
		@@ -765,6 +765,12 @@ status_t AudioFlingerClientAdapter::updateSecondaryOutputs(
		return statusTFromBinderStatus(mDelegate->updateSecondaryOutputs(trackSecondaryOutputInfos));
		}

		status_t AudioFlingerClientAdapter::setDeviceConnectedState(
		const struct audio_port_v7 *port, bool connected) {
		media::AudioPort aidlPort = VALUE_OR_RETURN_STATUS(
		legacy2aidl_audio_port_v7_AudioPort(*port));
		return statusTFromBinderStatus(mDelegate->setDeviceConnectedState(aidlPort, connected));
		}

		////////////////////////////////////////////////////////////////////////////////////////////////////
		// AudioFlingerServerAdapter
		@@ -1236,4 +1242,10 @@ Status AudioFlingerServerAdapter::updateSecondaryOutputs(
		return Status::fromStatusT(mDelegate->updateSecondaryOutputs(trackSecondaryOutputs));
		}

		Status AudioFlingerServerAdapter::setDeviceConnectedState(
		const media::AudioPort& port, bool connected) {
		audio_port_v7 portLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPort_audio_port_v7(port));
		return Status::fromStatusT(mDelegate->setDeviceConnectedState(&portLegacy, connected));
		}

		} // namespace android

+2 −0

Original line number	Diff line number	Diff line
		@@ -216,4 +216,6 @@ interface IAudioFlingerService {
		// This usually happens when there is a dynamic policy registered.
		void updateSecondaryOutputs(
		in TrackSecondaryOutputInfo[] trackSecondaryOutputInfos);

		void setDeviceConnectedState(in AudioPort devicePort, boolean connected);
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -347,6 +347,8 @@ public:

		virtual status_t updateSecondaryOutputs(
		const TrackSecondaryOutputsMap& trackSecondaryOutputs) = 0;

		virtual status_t setDeviceConnectedState(const struct audio_port_v7 *port, bool connected) = 0;
		};

		/**
		@@ -443,6 +445,7 @@ public:
		status_t setVibratorInfos(const std::vector<media::AudioVibratorInfo>& vibratorInfos) override;
		status_t updateSecondaryOutputs(
		const TrackSecondaryOutputsMap& trackSecondaryOutputs) override;
		status_t setDeviceConnectedState(const struct audio_port_v7 *port, bool connected) override;

		private:
		const sp<media::IAudioFlingerService> mDelegate;
		@@ -528,6 +531,7 @@ public:
		SET_AUDIO_HAL_PIDS = media::BnAudioFlingerService::TRANSACTION_setAudioHalPids,
		SET_VIBRATOR_INFOS = media::BnAudioFlingerService::TRANSACTION_setVibratorInfos,
		UPDATE_SECONDARY_OUTPUTS = media::BnAudioFlingerService::TRANSACTION_updateSecondaryOutputs,
		SET_DEVICE_CONNECTED_STATE = media::BnAudioFlingerService::TRANSACTION_setDeviceConnectedState,
		};

		/**
		@@ -637,6 +641,7 @@ public:
		Status setVibratorInfos(const std::vector<media::AudioVibratorInfo>& vibratorInfos) override;
		Status updateSecondaryOutputs(
		const std::vector<media::TrackSecondaryOutputInfo>& trackSecondaryOutputInfos) override;
		Status setDeviceConnectedState(const media::AudioPort& port, bool connected) override;

		private:
		const sp<AudioFlingerServerAdapter::Delegate> mDelegate;

+26 −0

Original line number	Diff line number	Diff line
		@@ -478,6 +478,32 @@ status_t DeviceHalHidl::removeDeviceEffect(
		}
		#endif

		status_t DeviceHalHidl::setConnectedState(const struct audio_port_v7 *port, bool connected) {
		if (mDevice == 0) return NO_INIT;
		#if MAJOR_VERSION == 7 && MINOR_VERSION == 1
		if (supportsSetConnectedState7_1) {
		AudioPort hidlPort;
		if (status_t result = HidlUtils::audioPortFromHal(*port, &hidlPort); result != NO_ERROR) {
		return result;
		}
		Return<Result> ret = mDevice->setConnectedState_7_1(hidlPort, connected);
		if (!ret.isOk() \|\| ret != Result::NOT_SUPPORTED) {
		return processReturn("setConnectedState_7_1", ret);
		} else if (ret == Result::OK) {
		return NO_ERROR;
		}
		supportsSetConnectedState7_1 = false;
		}
		#endif
		DeviceAddress hidlAddress;
		if (status_t result = CoreUtils::deviceAddressFromHal(
		port->ext.device.type, port->ext.device.address, &hidlAddress);
		result != NO_ERROR) {
		return result;
		}
		return processReturn("setConnectedState", mDevice->setConnectedState(hidlAddress, connected));
		}

		status_t DeviceHalHidl::dump(int fd, const Vector<String16>& args) {
		if (mDevice == 0) return NO_INIT;
		native_handle_t* hidlHandle = native_handle_create(1, 0);

+4 −1

Original line number	Diff line number	Diff line
		@@ -115,13 +115,16 @@ class DeviceHalHidl : public DeviceHalInterface, public ConversionHelperHidl
		status_t addDeviceEffect(audio_port_handle_t device, sp<EffectHalInterface> effect) override;
		status_t removeDeviceEffect(audio_port_handle_t device, sp<EffectHalInterface> effect) override;

		status_t setConnectedState(const struct audio_port_v7 *port, bool connected) override;

		status_t dump(int fd, const Vector<String16>& args) override;

		private:
		friend class DevicesFactoryHalHidl;
		sp<::android::hardware::audio::CPP_VERSION::IDevice> mDevice;
		sp<::android::hardware::audio::CPP_VERSION::IPrimaryDevice> mPrimaryDevice;
		// Null if it's not a primary device.
		sp<::android::hardware::audio::CPP_VERSION::IPrimaryDevice> mPrimaryDevice;
		bool supportsSetConnectedState7_1 = true;

		// Can not be constructed directly by clients.
		explicit DeviceHalHidl(const sp<::android::hardware::audio::CPP_VERSION::IDevice>& device);