Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bd874b8b: Merge "AudioManager: fix audio device callback list access" into mnc-dev

Browse Source 
* commit 'bd874b8be717110148e2b284f35d166b11c1fe7d':
  AudioManager: fix audio device callback list access
This commit is contained in:
Eric Laurent
2015-07-15 01:42:57 +00:00
committed by Android Git Automerger
parent 189f313661 bd874b8be7
commit c2db03b0b8
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
media/java/android/media/AudioManager.java
View File

@@ -3859,8 +3859,8 @@ public class AudioManager {
*/
public void registerAudioDeviceCallback(AudioDeviceCallback callback,
android.os.Handler handler) {
if (callback != null && !mDeviceCallbacks.containsKey(callback)) {
synchronized (mDeviceCallbacks) {
synchronized (mDeviceCallbacks) {
if (callback != null && !mDeviceCallbacks.containsKey(callback)) {
if (mDeviceCallbacks.size() == 0) {
if (mPortListener == null) {
mPortListener = new OnAmPortUpdateListener();
@@ -3924,21 +3924,20 @@ public class AudioManager {
calcListDeltas(current_ports, mPreviousPorts, GET_DEVICES_ALL);
if (added_devices.length != 0 || removed_devices.length != 0) {
Collection<NativeEventHandlerDelegate> values;
synchronized (mDeviceCallbacks) {
values = mDeviceCallbacks.values();
}
for (NativeEventHandlerDelegate delegate : values) {
handler = delegate.getHandler();
if (handler != null) {
if (added_devices.length != 0) {
handler.sendMessage(
Message.obtain(handler,MSG_DEVICES_DEVICES_ADDED, added_devices));
}
if (removed_devices.length != 0) {
handler.sendMessage(
Message.obtain(handler,MSG_DEVICES_DEVICES_REMOVED,
removed_devices));
for (int i = 0; i < mDeviceCallbacks.size(); i++) {
handler = mDeviceCallbacks.valueAt(i).getHandler();
if (handler != null) {
if (added_devices.length != 0) {
handler.sendMessage(Message.obtain(handler,
MSG_DEVICES_DEVICES_ADDED,
added_devices));
}
if (removed_devices.length != 0) {
handler.sendMessage(Message.obtain(handler,
MSG_DEVICES_DEVICES_REMOVED,
removed_devices));
}
}
}
}