Merge "Revert "Allow call audio access for default dialer application"" into rvc-dev am: bb044fc8c8 (86746741) · Commits · e / os / android_frameworks_av

media/libaudioclient/AudioSystem.cpp

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -886,7 +886,6 @@ status_t AudioSystem::getOutputForAttr(audio_attributes_t *attr,
	audio_stream_type_t *stream,		audio_stream_type_t *stream,
	pid_t pid,		pid_t pid,
	uid_t uid,		uid_t uid,
	const String16& opPackageName,
	const audio_config_t *config,		const audio_config_t *config,
	audio_output_flags_t flags,		audio_output_flags_t flags,
	audio_port_handle_t *selectedDeviceId,		audio_port_handle_t *selectedDeviceId,
	@@ -896,7 +895,7 @@ status_t AudioSystem::getOutputForAttr(audio_attributes_t *attr,
	const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();		const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
	if (aps == 0) return NO_INIT;		if (aps == 0) return NO_INIT;
	return aps->getOutputForAttr(attr, output, session, stream, pid, uid,		return aps->getOutputForAttr(attr, output, session, stream, pid, uid,
	opPackageName, config,		config,
	flags, selectedDeviceId, portId, secondaryOutputs);		flags, selectedDeviceId, portId, secondaryOutputs);
	}		}

media/libaudioclient/IAudioPolicyService.cpp

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -215,7 +215,6 @@ public:
	audio_stream_type_t *stream,		audio_stream_type_t *stream,
	pid_t pid,		pid_t pid,
	uid_t uid,		uid_t uid,
	const String16& opPackageName,
	const audio_config_t *config,		const audio_config_t *config,
	audio_output_flags_t flags,		audio_output_flags_t flags,
	audio_port_handle_t *selectedDeviceId,		audio_port_handle_t *selectedDeviceId,
	@@ -254,7 +253,6 @@ public:
	}		}
	data.writeInt32(pid);		data.writeInt32(pid);
	data.writeInt32(uid);		data.writeInt32(uid);
	data.writeString16(opPackageName);
	data.write(config, sizeof(audio_config_t));		data.write(config, sizeof(audio_config_t));
	data.writeInt32(static_cast <uint32_t>(flags));		data.writeInt32(static_cast <uint32_t>(flags));
	data.writeInt32(*selectedDeviceId);		data.writeInt32(*selectedDeviceId);
	@@ -1656,11 +1654,6 @@ status_t BnAudioPolicyService::onTransact(
	}		}
	pid_t pid = (pid_t)data.readInt32();		pid_t pid = (pid_t)data.readInt32();
	uid_t uid = (uid_t)data.readInt32();		uid_t uid = (uid_t)data.readInt32();
	String16 opPackageName;
	status = data.readString16(&opPackageName);
	if (status != NO_ERROR) {
	return status;
	}
	audio_config_t config;		audio_config_t config;
	memset(&config, 0, sizeof(audio_config_t));		memset(&config, 0, sizeof(audio_config_t));
	data.read(&config, sizeof(audio_config_t));		data.read(&config, sizeof(audio_config_t));
	@@ -1672,7 +1665,7 @@ status_t BnAudioPolicyService::onTransact(
	std::vector<audio_io_handle_t> secondaryOutputs;		std::vector<audio_io_handle_t> secondaryOutputs;
	status = getOutputForAttr(&attr,		status = getOutputForAttr(&attr,
	&output, session, &stream, pid, uid,		&output, session, &stream, pid, uid,
	opPackageName, &config,		&config,
	flags, &selectedDeviceId, &portId, &secondaryOutputs);		flags, &selectedDeviceId, &portId, &secondaryOutputs);
	reply->writeInt32(status);		reply->writeInt32(status);
	status = reply->write(&attr, sizeof(audio_attributes_t));		status = reply->write(&attr, sizeof(audio_attributes_t));

media/libaudioclient/include/media/AudioSystem.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -241,7 +241,6 @@ public:
	audio_stream_type_t *stream,		audio_stream_type_t *stream,
	pid_t pid,		pid_t pid,
	uid_t uid,		uid_t uid,
	const String16& opPackageName,
	const audio_config_t *config,		const audio_config_t *config,
	audio_output_flags_t flags,		audio_output_flags_t flags,
	audio_port_handle_t *selectedDeviceId,		audio_port_handle_t *selectedDeviceId,

media/libaudioclient/include/media/IAudioFlinger.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,6 @@ public:
	if (clientInfo.readFromParcel(parcel) != NO_ERROR) {		if (clientInfo.readFromParcel(parcel) != NO_ERROR) {
	return DEAD_OBJECT;		return DEAD_OBJECT;
	}		}
	opPackageName = parcel->readString16();
	if (parcel->readInt32() != 0) {		if (parcel->readInt32() != 0) {
	// TODO: Using unsecurePointer() has some associated security		// TODO: Using unsecurePointer() has some associated security
	// pitfalls (see declaration for details).		// pitfalls (see declaration for details).
	@@ -101,7 +100,6 @@ public:
	(void)parcel->write(&attr, sizeof(audio_attributes_t));		(void)parcel->write(&attr, sizeof(audio_attributes_t));
	(void)parcel->write(&config, sizeof(audio_config_t));		(void)parcel->write(&config, sizeof(audio_config_t));
	(void)clientInfo.writeToParcel(parcel);		(void)clientInfo.writeToParcel(parcel);
	(void)parcel->writeString16(opPackageName);
	if (sharedBuffer != 0) {		if (sharedBuffer != 0) {
	(void)parcel->writeInt32(1);		(void)parcel->writeInt32(1);
	(void)parcel->writeStrongBinder(IInterface::asBinder(sharedBuffer));		(void)parcel->writeStrongBinder(IInterface::asBinder(sharedBuffer));
	@@ -125,7 +123,6 @@ public:
	audio_attributes_t attr;		audio_attributes_t attr;
	audio_config_t config;		audio_config_t config;
	AudioClient clientInfo;		AudioClient clientInfo;
	String16 opPackageName;
	sp<IMemory> sharedBuffer;		sp<IMemory> sharedBuffer;
	uint32_t notificationsPerBuffer;		uint32_t notificationsPerBuffer;
	float speed;		float speed;

media/libaudioclient/include/media/IAudioPolicyService.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,6 @@ public:
	audio_stream_type_t *stream,		audio_stream_type_t *stream,
	pid_t pid,		pid_t pid,
	uid_t uid,		uid_t uid,
	const String16& opPackageName,
	const audio_config_t *config,		const audio_config_t *config,
	audio_output_flags_t flags,		audio_output_flags_t flags,
	audio_port_handle_t *selectedDeviceId,		audio_port_handle_t *selectedDeviceId,