Merge "Optimize attaching / detaching audio mixes." into udc-dev (12504654) · Commits · e / os / android_frameworks_base

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

+2 −6

Original line number	Diff line number	Diff line
		@@ -12478,20 +12478,16 @@ public class AudioService extends IAudioService.Stub
		}

		int addMixes(@NonNull ArrayList<AudioMix> mixes) {
		// TODO optimize to not have to unregister the mixes already in place
		synchronized (mMixes) {
		mAudioSystem.registerPolicyMixes(mMixes, false);
		this.add(mixes);
		return mAudioSystem.registerPolicyMixes(mMixes, true);
		return mAudioSystem.registerPolicyMixes(mixes, true);
		}
		}

		int removeMixes(@NonNull ArrayList<AudioMix> mixes) {
		// TODO optimize to not have to unregister the mixes already in place
		synchronized (mMixes) {
		mAudioSystem.registerPolicyMixes(mMixes, false);
		this.remove(mixes);
		return mAudioSystem.registerPolicyMixes(mMixes, true);
		return mAudioSystem.registerPolicyMixes(mixes, false);
		}
		}