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 b89353ba0f)
Merged-In: I7bd9b61ad46ba2bf2395daad8257f9cd79c73159
This commit is contained in:
Shunkai Yao
2023-07-20 01:52:11 +00:00
parent 53e003894a
commit 5dbcff080c

View File

@@ -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
*/