diff options
| author | Phil Burk <philburk@google.com> | 2015-08-05 19:43:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-05 19:43:21 +0000 |
| commit | 881cd15519535e493d497fefd857f8fe0236c774 (patch) | |
| tree | b8111a2304b9e3dd8fe9fe53d39ee94efae6159e /media/java | |
| parent | 8cc00243423e22a36c518cd5ece97b45271ae5e8 (diff) | |
| parent | a95faf78bf810e0b4eb3cb211c414bfbbd1a8061 (diff) | |
| download | frameworks_base-881cd15519535e493d497fefd857f8fe0236c774.zip frameworks_base-881cd15519535e493d497fefd857f8fe0236c774.tar.gz frameworks_base-881cd15519535e493d497fefd857f8fe0236c774.tar.bz2 | |
Merge "MidiManager: use ConcurrentHashMap" into mnc-dev
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/midi/MidiManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/java/android/media/midi/MidiManager.java b/media/java/android/media/midi/MidiManager.java index 89230fe..7197dc0 100644 --- a/media/java/android/media/midi/MidiManager.java +++ b/media/java/android/media/midi/MidiManager.java @@ -24,7 +24,7 @@ import android.os.Handler; import android.os.RemoteException; import android.util.Log; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; /** * This class is the public application interface to the MIDI service. @@ -61,8 +61,8 @@ public final class MidiManager { private final IMidiManager mService; private final IBinder mToken = new Binder(); - private HashMap<DeviceCallback,DeviceListener> mDeviceListeners = - new HashMap<DeviceCallback,DeviceListener>(); + private ConcurrentHashMap<DeviceCallback,DeviceListener> mDeviceListeners = + new ConcurrentHashMap<DeviceCallback,DeviceListener>(); // Binder stub for receiving device notifications from MidiService private class DeviceListener extends IMidiDeviceListener.Stub { |