Merge "audio policy: disable silencing of background UID record" into pi-dev (fcf9a4c7) · Commits · e / os / android_frameworks_av

services/audiopolicy/service/AudioPolicyService.cpp

+24 −18

Original line number	Original line	Diff line number	Diff line
	@@ -332,16 +332,19 @@ status_t AudioPolicyService::dumpInternals(int fd)

	void AudioPolicyService::setRecordSilenced(uid_t uid, bool silenced)		void AudioPolicyService::setRecordSilenced(uid_t uid, bool silenced)
	{		{
	{		// FIXME: temporarily disable while investigating issue b/77300296
	Mutex::Autolock _l(mLock);		// {
	if (mAudioPolicyManager) {		// Mutex::Autolock _l(mLock);
	mAudioPolicyManager->setRecordSilenced(uid, silenced);		// if (mAudioPolicyManager) {
	}		// mAudioPolicyManager->setRecordSilenced(uid, silenced);
	}		// }
	sp<IAudioFlinger> af = AudioSystem::get_audio_flinger();		// }
	if (af) {		// sp<IAudioFlinger> af = AudioSystem::get_audio_flinger();
	af->setRecordSilenced(uid, silenced);		// if (af) {
	}		// af->setRecordSilenced(uid, silenced);
			// }
			(void)uid;
			(void)silenced;
	}		}

	status_t AudioPolicyService::dump(int fd, const Vector<String16>& args __unused)		status_t AudioPolicyService::dump(int fd, const Vector<String16>& args __unused)
	@@ -582,15 +585,18 @@ bool AudioPolicyService::UidPolicy::isUidActive(uid_t uid) {

	bool AudioPolicyService::UidPolicy::isUidActiveLocked(uid_t uid) {		bool AudioPolicyService::UidPolicy::isUidActiveLocked(uid_t uid) {
	// Non-app UIDs are considered always active		// Non-app UIDs are considered always active
	if (uid < FIRST_APPLICATION_UID) {		// FIXME: temporarily disable while investigating issue b/77300296
			// if (uid < FIRST_APPLICATION_UID) {
			// return true;
			// }
			// auto it = mOverrideUids.find(uid);
			// if (it != mOverrideUids.end()) {
			// return it->second;
			// }
			// return mActiveUids.find(uid) != mActiveUids.end();
			(void)uid;
	return true;		return true;
	}		}
	auto it = mOverrideUids.find(uid);
	if (it != mOverrideUids.end()) {
	return it->second;
	}
	return mActiveUids.find(uid) != mActiveUids.end();
	}

	// ----------- AudioPolicyService::AudioCommandThread implementation ----------		// ----------- AudioPolicyService::AudioCommandThread implementation ----------