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

Commit bfd1276e 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: b0fe0e98

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



Change-Id: Ifea6f5e5cc31b8e9e8ba883e9d832135928d869e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d0e195c b0fe0e98

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;