Merge "audio service: fix rapid succession of A2DP devices connections" into oc-dev (beda612c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/AudioService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -3931,7 +3931,7 @@ public class AudioService extends IAudioService.Stub

		public int setBluetoothA2dpDeviceConnectionState(BluetoothDevice device, int state, int profile)
		{
		if (mAudioHandler.hasMessages(MSG_SET_A2DP_SINK_CONNECTION_STATE)) {
		if (mAudioHandler.hasMessages(MSG_SET_A2DP_SINK_CONNECTION_STATE, device)) {
		return 0;
		}
		return setBluetoothA2dpDeviceConnectionStateInt(
		@@ -5070,7 +5070,7 @@ public class AudioService extends IAudioService.Stub

		private void onSetA2dpSinkConnectionState(BluetoothDevice btDevice, int state)
		{
		if (DEBUG_VOL) {
		if (DEBUG_DEVICES) {
		Log.d(TAG, "onSetA2dpSinkConnectionState btDevice=" + btDevice+"state=" + state);
		}
		if (btDevice == null) {
		@@ -5173,7 +5173,7 @@ public class AudioService extends IAudioService.Stub

		int device = AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP;
		synchronized (mConnectedDevices) {
		if (mAudioHandler.hasMessages(MSG_SET_A2DP_SINK_CONNECTION_STATE)) {
		if (mAudioHandler.hasMessages(MSG_SET_A2DP_SINK_CONNECTION_STATE, btDevice)) {
		return;
		}
		final String key = makeDeviceListKey(device, address);