summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shaowei Shen <shaoweishen@google.com> 2022-06-22 08:55:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-22 08:55:38 +0000
commit65a3d8ebc49af637cff3d1095f599f56fa2b2c8a (patch)
tree45d0f94b269d57f83e7c5a99d4199c9a36192a71
parent88efc6f72e0aeec0a9b0781afc40644971a71db9 (diff)
parent84612594e20b9e8a142b594ca143b84827e0c19f (diff)
Merge "[Output Switcher] Use Thread-safe list to store mediaDevices in MediaManager" into tm-dev am: 82c3268cbe am: 84612594e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18911999 Change-Id: I379bfaf61110d831a031eb98e88fff2ebb0a87e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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;