Merge "audioservice: fix hasMediaDynamicPolicy() for loopback and render policies" into qt-r1-dev (f6b54397) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/AudioService.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -5578,6 +5578,7 @@ public class AudioService extends IAudioService.Stub

		/**
		* @return true if there is currently a registered dynamic mixing policy that affects media
		* and is not a render + loopback policy
		*/
		/package/ boolean hasMediaDynamicPolicy() {
		synchronized (mAudioPolicies) {
		@@ -5586,7 +5587,8 @@ public class AudioService extends IAudioService.Stub
		}
		final Collection<AudioPolicyProxy> appColl = mAudioPolicies.values();
		for (AudioPolicyProxy app : appColl) {
		if (app.hasMixAffectingUsage(AudioAttributes.USAGE_MEDIA)) {
		if (app.hasMixAffectingUsage(AudioAttributes.USAGE_MEDIA,
		AudioMix.ROUTE_FLAG_LOOP_BACK_RENDER)) {
		return true;
		}
		}
		@@ -7349,9 +7351,10 @@ public class AudioService extends IAudioService.Stub
		Binder.restoreCallingIdentity(identity);
		}

		boolean hasMixAffectingUsage(int usage) {
		boolean hasMixAffectingUsage(int usage, int excludedFlags) {
		for (AudioMix mix : mMixes) {
		if (mix.isAffectingUsage(usage)) {
		if (mix.isAffectingUsage(usage)
		&& ((mix.getRouteFlags() & excludedFlags) != excludedFlags)) {
		return true;
		}
		}