Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65a3d8eb authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Use Thread-safe list to store mediaDevices in... 

Merge "[Output Switcher] Use Thread-safe list to store mediaDevices in MediaManager" into tm-dev am: 82c3268c am: 84612594

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18911999



Change-Id: I379bfaf61110d831a031eb98e88fff2ebb0a87e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88efc6f7 84612594

packages/SettingsLib/src/com/android/settingslib/media/MediaManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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;