Merge "audio policy: session routes continued." into mnc-dev (5f9bf493) · Commits · e / os / android_frameworks_av

include/media/AudioSystem.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -226,6 +226,7 @@ public:
		audio_io_handle_t *output,
		audio_session_t session,
		audio_stream_type_t *stream,
		uid_t uid,
		uint32_t samplingRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		audio_channel_mask_t channelMask = AUDIO_CHANNEL_OUT_STEREO,
		@@ -247,6 +248,7 @@ public:
		static status_t getInputForAttr(const audio_attributes_t *attr,
		audio_io_handle_t *input,
		audio_session_t session,
		uid_t uid,
		uint32_t samplingRate,
		audio_format_t format,
		audio_channel_mask_t channelMask,

+2 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ public:
		audio_io_handle_t *output,
		audio_session_t session,
		audio_stream_type_t *stream,
		uid_t uid,
		uint32_t samplingRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		audio_channel_mask_t channelMask = 0,
		@@ -80,6 +81,7 @@ public:
		virtual status_t getInputForAttr(const audio_attributes_t *attr,
		audio_io_handle_t *input,
		audio_session_t session,
		uid_t uid,
		uint32_t samplingRate,
		audio_format_t format,
		audio_channel_mask_t channelMask,

+1 −0

Original line number	Diff line number	Diff line
		@@ -481,6 +481,7 @@ status_t AudioRecord::openRecord_l(size_t epoch, const String16& opPackageName)
		audio_io_handle_t input;
		status_t status = AudioSystem::getInputForAttr(&mAttributes, &input,
		(audio_session_t)mSessionId,
		IPCThreadState::self()->getCallingUid(),
		mSampleRate, mFormat, mChannelMask,
		mFlags, mSelectedDeviceId);

+4 −2

Original line number	Diff line number	Diff line
		@@ -660,6 +660,7 @@ status_t AudioSystem::getOutputForAttr(const audio_attributes_t *attr,
		audio_io_handle_t *output,
		audio_session_t session,
		audio_stream_type_t *stream,
		uid_t uid,
		uint32_t samplingRate,
		audio_format_t format,
		audio_channel_mask_t channelMask,
		@@ -669,7 +670,7 @@ status_t AudioSystem::getOutputForAttr(const audio_attributes_t *attr,
		{
		const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
		if (aps == 0) return NO_INIT;
		return aps->getOutputForAttr(attr, output, session, stream,
		return aps->getOutputForAttr(attr, output, session, stream, uid,
		samplingRate, format, channelMask,
		flags, selectedDeviceId, offloadInfo);
		}
		@@ -704,6 +705,7 @@ void AudioSystem::releaseOutput(audio_io_handle_t output,
		status_t AudioSystem::getInputForAttr(const audio_attributes_t *attr,
		audio_io_handle_t *input,
		audio_session_t session,
		uid_t uid,
		uint32_t samplingRate,
		audio_format_t format,
		audio_channel_mask_t channelMask,
		@@ -713,7 +715,7 @@ status_t AudioSystem::getInputForAttr(const audio_attributes_t *attr,
		const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
		if (aps == 0) return NO_INIT;
		return aps->getInputForAttr(
		attr, input, session, samplingRate, format, channelMask, flags, selectedDeviceId);
		attr, input, session, uid, samplingRate, format, channelMask, flags, selectedDeviceId);
		}

		status_t AudioSystem::startInput(audio_io_handle_t input,

+1 −1

Original line number	Diff line number	Diff line
		@@ -1063,7 +1063,7 @@ status_t AudioTrack::createTrack_l()

		status_t status;
		status = AudioSystem::getOutputForAttr(attr, &output,
		(audio_session_t)mSessionId, &streamType,
		(audio_session_t)mSessionId, &streamType, mClientUid,
		mSampleRate, mFormat, mChannelMask,
		mFlags, mSelectedDeviceId, mOffloadInfo);