Merge "audio policy: add permission check for privileged attributes flags" into qt-dev (745bba2d) · Commits · e / os / android_frameworks_av

media/libaudioclient/AudioSystem.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -864,7 +864,7 @@ audio_io_handle_t AudioSystem::getOutput(audio_stream_type_t stream)
		return aps->getOutput(stream);
		}

		status_t AudioSystem::getOutputForAttr(const audio_attributes_t *attr,
		status_t AudioSystem::getOutputForAttr(audio_attributes_t *attr,
		audio_io_handle_t *output,
		audio_session_t session,
		audio_stream_type_t *stream,

media/libaudioclient/IAudioPolicyService.cpp

+27 −30

Original line number	Diff line number	Diff line
		@@ -198,7 +198,7 @@ public:
		return static_cast <audio_io_handle_t> (reply.readInt32());
		}

		status_t getOutputForAttr(const audio_attributes_t *attr,
		status_t getOutputForAttr(audio_attributes_t *attr,
		audio_io_handle_t *output,
		audio_session_t session,
		audio_stream_type_t *stream,
		@@ -212,38 +212,27 @@ public:
		{
		Parcel data, reply;
		data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
		if (attr == NULL) {
		if (stream == NULL) {
		ALOGE("getOutputForAttr(): NULL audio attributes and stream type");
		return BAD_VALUE;
		}
		if (*stream == AUDIO_STREAM_DEFAULT) {
		ALOGE("getOutputForAttr unspecified stream type");
		if (attr == nullptr) {
		ALOGE("%s NULL audio attributes", __func__);
		return BAD_VALUE;
		}
		}
		if (output == NULL) {
		ALOGE("getOutputForAttr NULL output - shouldn't happen");
		if (output == nullptr) {
		ALOGE("%s NULL output - shouldn't happen", __func__);
		return BAD_VALUE;
		}
		if (selectedDeviceId == NULL) {
		ALOGE("getOutputForAttr NULL selectedDeviceId - shouldn't happen");
		if (selectedDeviceId == nullptr) {
		ALOGE("%s NULL selectedDeviceId - shouldn't happen", __func__);
		return BAD_VALUE;
		}
		if (portId == NULL) {
		ALOGE("getOutputForAttr NULL portId - shouldn't happen");
		if (portId == nullptr) {
		ALOGE("%s NULL portId - shouldn't happen", __func__);
		return BAD_VALUE;
		}
		if (secondaryOutputs == NULL) {
		ALOGE("getOutputForAttr NULL secondaryOutputs - shouldn't happen");
		if (secondaryOutputs == nullptr) {
		ALOGE("%s NULL secondaryOutputs - shouldn't happen", __func__);
		return BAD_VALUE;
		}
		if (attr == NULL) {
		data.writeInt32(0);
		} else {
		data.writeInt32(1);
		data.write(attr, sizeof(audio_attributes_t));
		}
		data.writeInt32(session);
		if (stream == NULL) {
		data.writeInt32(0);
		@@ -265,6 +254,10 @@ public:
		if (status != NO_ERROR) {
		return status;
		}
		status = (status_t)reply.read(&attr, sizeof(audio_attributes_t));
		if (status != NO_ERROR) {
		return status;
		}
		*output = (audio_io_handle_t)reply.readInt32();
		audio_stream_type_t lStream = (audio_stream_type_t)reply.readInt32();
		if (stream != NULL) {
		@@ -1449,12 +1442,12 @@ status_t BnAudioPolicyService::onTransact(

		case GET_OUTPUT_FOR_ATTR: {
		CHECK_INTERFACE(IAudioPolicyService, data, reply);
		audio_attributes_t attr = {};
		bool hasAttributes = data.readInt32() != 0;
		if (hasAttributes) {
		data.read(&attr, sizeof(audio_attributes_t));
		sanetizeAudioAttributes(&attr);
		audio_attributes_t attr = AUDIO_ATTRIBUTES_INITIALIZER;
		status_t status = data.read(&attr, sizeof(audio_attributes_t));
		if (status != NO_ERROR) {
		return status;
		}
		sanetizeAudioAttributes(&attr);
		audio_session_t session = (audio_session_t)data.readInt32();
		audio_stream_type_t stream = AUDIO_STREAM_DEFAULT;
		bool hasStream = data.readInt32() != 0;
		@@ -1472,11 +1465,15 @@ status_t BnAudioPolicyService::onTransact(
		audio_port_handle_t portId = (audio_port_handle_t)data.readInt32();
		audio_io_handle_t output = 0;
		std::vector<audio_io_handle_t> secondaryOutputs;
		status_t status = getOutputForAttr(hasAttributes ? &attr : NULL,
		status = getOutputForAttr(&attr,
		&output, session, &stream, pid, uid,
		&config,
		flags, &selectedDeviceId, &portId, &secondaryOutputs);
		reply->writeInt32(status);
		status = reply->write(&attr, sizeof(audio_attributes_t));
		if (status != NO_ERROR) {
		return status;
		}
		reply->writeInt32(output);
		reply->writeInt32(stream);
		reply->writeInt32(selectedDeviceId);

media/libaudioclient/include/media/AudioSystem.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -223,7 +223,7 @@ public:
		static status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config);
		static audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage);

		static status_t getOutputForAttr(const audio_attributes_t *attr,
		static status_t getOutputForAttr(audio_attributes_t *attr,
		audio_io_handle_t *output,
		audio_session_t session,
		audio_stream_type_t *stream,

media/libaudioclient/include/media/IAudioPolicyService.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ public:
		audio_policy_forced_cfg_t config) = 0;
		virtual audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage) = 0;
		virtual audio_io_handle_t getOutput(audio_stream_type_t stream) = 0;
		virtual status_t getOutputForAttr(const audio_attributes_t *attr,
		virtual status_t getOutputForAttr(audio_attributes_t *attr,
		audio_io_handle_t *output,
		audio_session_t session,
		audio_stream_type_t *stream,

media/utils/ServiceUtilities.cpp

+15 −4

Original line number	Diff line number	Diff line
		@@ -35,6 +35,8 @@
		namespace android {

		static const String16 sAndroidPermissionRecordAudio("android.permission.RECORD_AUDIO");
		static const String16 sModifyPhoneState("android.permission.MODIFY_PHONE_STATE");
		static const String16 sModifyAudioRouting("android.permission.MODIFY_AUDIO_ROUTING");

		static String16 resolveCallingPackage(PermissionController& permissionController,
		const String16& opPackageName, uid_t uid) {
		@@ -162,9 +164,8 @@ bool settingsAllowed() {
		}

		bool modifyAudioRoutingAllowed() {
		static const String16 sModifyAudioRoutingAllowed("android.permission.MODIFY_AUDIO_ROUTING");
		// IMPORTANT: Use PermissionCache - not a runtime permission and may not change.
		bool ok = PermissionCache::checkCallingPermission(sModifyAudioRoutingAllowed);
		bool ok = PermissionCache::checkCallingPermission(sModifyAudioRouting);
		if (!ok) ALOGE("android.permission.MODIFY_AUDIO_ROUTING");
		return ok;
		}
		@@ -200,9 +201,19 @@ bool dumpAllowed() {
		}

		bool modifyPhoneStateAllowed(pid_t pid, uid_t uid) {
		static const String16 sModifyPhoneState("android.permission.MODIFY_PHONE_STATE");
		bool ok = PermissionCache::checkPermission(sModifyPhoneState, pid, uid);
		if (!ok) ALOGE("Request requires android.permission.MODIFY_PHONE_STATE");
		ALOGE_IF(!ok, "Request requires %s", String8(sModifyPhoneState).c_str());
		return ok;
		}

		// privileged behavior needed by Dialer, Settings, SetupWizard and CellBroadcastReceiver
		bool bypassInterruptionPolicyAllowed(pid_t pid, uid_t uid) {
		static const String16 sWriteSecureSettings("android.permission.WRITE_SECURE_SETTINGS");
		bool ok = PermissionCache::checkPermission(sModifyPhoneState, pid, uid)
		\|\| PermissionCache::checkPermission(sWriteSecureSettings, pid, uid)
		\|\| PermissionCache::checkPermission(sModifyAudioRouting, pid, uid);
		ALOGE_IF(!ok, "Request requires %s or %s",
		String8(sModifyPhoneState).c_str(), String8(sWriteSecureSettings).c_str());
		return ok;
		}