Merge "AudioService: fix A2DP disconnection / reconnection" am: 2faf009dda am:... (9b6b49dc) · Commits · e / os / android_frameworks_base

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

+10 −8

Original line number	Original line	Diff line number	Diff line
	@@ -241,7 +241,8 @@ public class AudioDeviceInventory {
	} else {		} else {
	makeA2dpDeviceUnavailableNow(address, di.mDeviceCodecFormat);		makeA2dpDeviceUnavailableNow(address, di.mDeviceCodecFormat);
	}		}
	}		} else if (state == BluetoothProfile.STATE_CONNECTED) {
			// device is not already connected
	if (a2dpVolume != -1) {		if (a2dpVolume != -1) {
	mDeviceBroker.postSetVolumeIndexOnDevice(AudioSystem.STREAM_MUSIC,		mDeviceBroker.postSetVolumeIndexOnDevice(AudioSystem.STREAM_MUSIC,
	// convert index to internal representation in VolumeStreamState		// convert index to internal representation in VolumeStreamState
	@@ -252,6 +253,7 @@ public class AudioDeviceInventory {
	"onSetA2dpSinkConnectionState", a2dpCodec);		"onSetA2dpSinkConnectionState", a2dpCodec);
	}		}
	}		}
			}

	/package/ void onSetA2dpSourceConnectionState(		/package/ void onSetA2dpSourceConnectionState(
	@NonNull BtHelper.BluetoothA2dpDeviceInfo btInfo, int state) {		@NonNull BtHelper.BluetoothA2dpDeviceInfo btInfo, int state) {