Merge "AudioManager: fix audio device callback list access" into mnc-dev (bd874b8b) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManager.java

+15 −16

Original line number	Diff line number	Diff line
		@@ -3859,8 +3859,8 @@ public class AudioManager {
		*/
		public void registerAudioDeviceCallback(AudioDeviceCallback callback,
		android.os.Handler handler) {
		if (callback != null && !mDeviceCallbacks.containsKey(callback)) {
		synchronized (mDeviceCallbacks) {
		if (callback != null && !mDeviceCallbacks.containsKey(callback)) {
		if (mDeviceCallbacks.size() == 0) {
		if (mPortListener == null) {
		mPortListener = new OnAmPortUpdateListener();
		@@ -3924,26 +3924,25 @@ 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();
		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));
		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,
		handler.sendMessage(Message.obtain(handler,
		MSG_DEVICES_DEVICES_REMOVED,
		removed_devices));
		}
		}
		}
		}
		}
		}

		mPreviousPorts = current_ports;
		}