From 5dbcff080c7590180a98e2c2910b8efc57f6bda8 Mon Sep 17 00:00:00 2001
From: Shunkai Yao <yaoshunkai@google.com>
Date: Thu, 20 Jul 2023 01:52:11 +0000
Subject: [PATCH] Access AudioPlaybackConfiguration players under mPlayerLock

Test: build and flash to Panther
Test: run cts-dev -m CtsMediaAudioTestCases  -t android.media.audio.cts.AudioPlaybackConfigurationTest
Bug: 247551216
Change-Id: I7bd9b61ad46ba2bf2395daad8257f9cd79c73159
(cherry picked from commit b89353ba0f5eafc8c1196447fec53b848f50f640)
Merged-In: I7bd9b61ad46ba2bf2395daad8257f9cd79c73159
---
 .../android/server/audio/PlaybackActivityMonitor.java    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
index 3f4f981dc0b8b..23a0782dc8a3e 100644
--- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
+++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
@@ -989,21 +989,16 @@ public final class PlaybackActivityMonitor
     }
 
     List<AudioPlaybackConfiguration> getActivePlaybackConfigurations(boolean isPrivileged) {
-        synchronized(mPlayers) {
+        synchronized (mPlayerLock) {
             if (isPrivileged) {
                 return new ArrayList<AudioPlaybackConfiguration>(mPlayers.values());
             } else {
-                final List<AudioPlaybackConfiguration> configsPublic;
-                synchronized (mPlayerLock) {
-                    configsPublic = anonymizeForPublicConsumption(
+                return anonymizeForPublicConsumption(
                             new ArrayList<AudioPlaybackConfiguration>(mPlayers.values()));
-                }
-                return configsPublic;
             }
         }
     }
 
-
     /**
      * Inner class to track clients that want to be notified of playback updates
      */