summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shunkai Yao <yaoshunkai@google.com> 2023-12-12 19:05:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-12 19:05:39 +0000
commitc4c78b904ffc337f144b380af8940a3e537cf928 (patch)
tree3b810e1e2019c1de41c212bc88b061bcf4e8b502
parent3ee3a56650f75086cb39a6cad66f3991dff594a5 (diff)
parentbf59e7edd489ad3342d3c0816b0ea163088a7416 (diff)
MusicFxHelper: avoid modify AudioSession list while iterating am: bf59e7edd4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2869795 Change-Id: Ia52f5cfd1542a3c2fe493f81152e65dde8fe66ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/audio/MusicFxHelper.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/MusicFxHelper.java b/services/core/java/com/android/server/audio/MusicFxHelper.java
index 6c0fef5f628d..5f4e4c3bc4e0 100644
--- a/services/core/java/com/android/server/audio/MusicFxHelper.java
+++ b/services/core/java/com/android/server/audio/MusicFxHelper.java
@@ -157,7 +157,8 @@ public class MusicFxHelper {
Log.w(TAG, " inside handle MSG_EFFECT_CLIENT_GONE");
// Once the uid is no longer running, close all remain audio session(s) for this UID
if (mClientUidSessionMap.get(Integer.valueOf(uid)) != null) {
- final List<Integer> sessions = mClientUidSessionMap.get(Integer.valueOf(uid));
+ final List<Integer> sessions =
+ new ArrayList(mClientUidSessionMap.get(Integer.valueOf(uid)));
Log.i(TAG, "UID " + uid + " gone, closing " + sessions.size() + " sessions");
for (Integer session : sessions) {
Intent intent = new Intent(