summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaowei Shen <shaoweishen@google.com>2022-06-22 08:01:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-06-22 08:01:56 +0000
commit82c3268cbec2fd56e79252f5cf029e5153416e26 (patch)
treedac29836f06dd762cb14cefd16810f37192ca159
parentcfe0279f69c028753edc4c2fe7bfc8928eeb841a (diff)
parent84d0224973166b181dddbab3f65b04f1712eec65 (diff)
downloadbase-82c3268cbec2fd56e79252f5cf029e5153416e26.tar.gz
Merge "[Output Switcher] Use Thread-safe list to store mediaDevices in MediaManager" into tm-dev
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/media/MediaManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaManager.java
index e8cbab8197b2..a040e28169e8 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/MediaManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaManager.java
@@ -32,7 +32,7 @@ public abstract class MediaManager {
private static final String TAG = "MediaManager";
protected final Collection<MediaDeviceCallback> mCallbacks = new CopyOnWriteArrayList<>();
- protected final List<MediaDevice> mMediaDevices = new ArrayList<>();
+ protected final List<MediaDevice> mMediaDevices = new CopyOnWriteArrayList<>();
protected Context mContext;
protected Notification mNotification;