Merge cherrypicks of ['googleplex-android-review.googlesource.com/30847529'] into 25Q1-release. (243a3a62) · Commits · e / os / android_frameworks_av

media/utils/ServiceUtilities.cpp

+2 −4

Original line number	Diff line number	Diff line
		@@ -80,9 +80,7 @@ static String16 resolveCallingPackage(PermissionController& permissionController
		}

		// NOTE/TODO(b/379754682):
		// AUDIO_SOURCE_VOICE_DOWNLINK and AUDIO_SOURCE_VOICE_CALL are handled specially:
		// DOWNLINK is an output source, but we still require RecordOp in addition to
		// OP_RECORD_INCOMING_PHONE_AUDIO
		// AUDIO_SOURCE_VOICE_CALL is handled specially:
		// CALL includes both uplink and downlink, but we attribute RECORD_OP (only), since
		// there is not support for noting multiple ops.
		int32_t getOpForSource(audio_source_t source) {
		@@ -110,7 +108,7 @@ bool isRecordOpRequired(audio_source_t source) {
		case AUDIO_SOURCE_FM_TUNER:
		case AUDIO_SOURCE_ECHO_REFERENCE: // fallthrough
		case AUDIO_SOURCE_REMOTE_SUBMIX:
		// case AUDIO_SOURCE_VOICE_DOWNLINK:
		case AUDIO_SOURCE_VOICE_DOWNLINK:
		return false;
		default:
		return true;