Merge cherrypicks of [20248676] into tm-qpr1-release. (cf251a84) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+1 −5

Original line number	Diff line number	Diff line
		@@ -1067,8 +1067,6 @@ status_t AudioFlinger::createTrack(const media::CreateTrackRequest& _input,
		clientPid = callingPid;
		adjAttributionSource.pid = VALUE_OR_RETURN_STATUS(legacy2aidl_pid_t_int32_t(callingPid));
		}
		adjAttributionSource = AudioFlinger::checkAttributionSourcePackage(
		adjAttributionSource);

		audio_session_t sessionId = input.sessionId;
		if (sessionId == AUDIO_SESSION_ALLOCATE) {
		@@ -2291,8 +2289,7 @@ status_t AudioFlinger::createRecord(const media::CreateRecordRequest& _input,
		__func__, callingUid, callingPid, currentPid);
		adjAttributionSource.pid = VALUE_OR_RETURN_STATUS(legacy2aidl_pid_t_int32_t(callingPid));
		}
		adjAttributionSource = AudioFlinger::checkAttributionSourcePackage(
		adjAttributionSource);

		// we don't yet support anything other than linear PCM
		if (!audio_is_valid_format(input.config.format) \|\| !audio_is_linear_pcm(input.config.format)) {
		ALOGE("createRecord() invalid format %#x", input.config.format);
		@@ -3917,7 +3914,6 @@ status_t AudioFlinger::createEffect(const media::CreateEffectRequest& request,
		adjAttributionSource.pid = VALUE_OR_RETURN_STATUS(legacy2aidl_pid_t_int32_t(callingPid));
		currentPid = callingPid;
		}
		adjAttributionSource = AudioFlinger::checkAttributionSourcePackage(adjAttributionSource);

		ALOGV("createEffect pid %d, effectClient %p, priority %d, sessionId %d, io %d, factory %p",
		adjAttributionSource.pid, effectClient.get(), priority, sessionId, io,

services/audioflinger/Threads.cpp

+6 −4

Original line number	Diff line number	Diff line
		@@ -8308,6 +8308,8 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe
		audio_input_flags_t inputFlags = mInput->flags;
		audio_input_flags_t requestedFlags = *flags;
		uint32_t sampleRate;
		AttributionSourceState checkedAttributionSource = AudioFlinger::checkAttributionSourcePackage(
		attributionSource);

		lStatus = initCheck();
		if (lStatus != NO_ERROR) {
		@@ -8322,7 +8324,7 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe
		}

		if (maxSharedAudioHistoryMs != 0) {
		if (!captureHotwordAllowed(attributionSource)) {
		if (!captureHotwordAllowed(checkedAttributionSource)) {
		lStatus = PERMISSION_DENIED;
		goto Exit;
		}
		@@ -8443,16 +8445,16 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe
		Mutex::Autolock _l(mLock);
		int32_t startFrames = -1;
		if (!mSharedAudioPackageName.empty()
		&& mSharedAudioPackageName == attributionSource.packageName
		&& mSharedAudioPackageName == checkedAttributionSource.packageName
		&& mSharedAudioSessionId == sessionId
		&& captureHotwordAllowed(attributionSource)) {
		&& captureHotwordAllowed(checkedAttributionSource)) {
		startFrames = mSharedAudioStartFrames;
		}

		track = new RecordTrack(this, client, attr, sampleRate,
		format, channelMask, frameCount,
		nullptr /* buffer /, (size_t)0 / bufferSize */, sessionId, creatorPid,
		attributionSource, *flags, TrackBase::TYPE_DEFAULT, portId,
		checkedAttributionSource, *flags, TrackBase::TYPE_DEFAULT, portId,
		startFrames);

		lStatus = track->initCheck();

services/audioflinger/Tracks.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -529,7 +529,10 @@ AudioFlinger::PlaybackThread::OpPlayAudioMonitor::createIfNeeded(
		id, attr.flags);
		return nullptr;
		}
		return new OpPlayAudioMonitor(attributionSource, attr.usage, id);

		AttributionSourceState checkedAttributionSource = AudioFlinger::checkAttributionSourcePackage(
		attributionSource);
		return new OpPlayAudioMonitor(checkedAttributionSource, attr.usage, id);
		}

		AudioFlinger::PlaybackThread::OpPlayAudioMonitor::OpPlayAudioMonitor(