Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c51d4e7d authored by Ján Sebechlebský's avatar Ján Sebechlebský Committed by Automerger Merge Worker
Browse files

Merge "Optimize attaching / detaching audio mixes." into udc-dev am: 12504654 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22607657



Change-Id: Ia1e80c170d4b13ebb1d1fbd903fcf31e72d6c0dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d08f7c9 12504654

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);















            }















        }