Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public." (16664dfe) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/a2dp/A2dpCodecConfig.java

+25 −30

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@ import android.util.Log;

	import com.android.bluetooth.R;		import com.android.bluetooth.R;

	import java.util.Arrays;		import java.util.List;
	import java.util.Objects;		import java.util.Objects;
	/*		/*
	* A2DP Codec Configuration setup.		* A2DP Codec Configuration setup.
	@@ -82,8 +82,8 @@ class A2dpCodecConfig {
	Objects.requireNonNull(codecStatus);		Objects.requireNonNull(codecStatus);

	// Check whether the codecConfig is selectable for this Bluetooth device.		// Check whether the codecConfig is selectable for this Bluetooth device.
	BluetoothCodecConfig[] selectableCodecs = codecStatus.getCodecsSelectableCapabilities();		List<BluetoothCodecConfig> selectableCodecs = codecStatus.getCodecsSelectableCapabilities();
	if (!Arrays.asList(selectableCodecs).stream().anyMatch(codec ->		if (!selectableCodecs.stream().anyMatch(codec ->
	codec.isMandatoryCodec())) {		codec.isMandatoryCodec())) {
	// Do not set codec preference to native if the selectableCodecs not contain mandatory		// Do not set codec preference to native if the selectableCodecs not contain mandatory
	// codec. The reason could be remote codec negotiation is not completed yet.		// codec. The reason could be remote codec negotiation is not completed yet.
	@@ -160,7 +160,7 @@ class A2dpCodecConfig {

	// Get the codec type of the highest priority of selectableCodecs and codecConfig.		// Get the codec type of the highest priority of selectableCodecs and codecConfig.
	private int getPrioitizedCodecType(BluetoothCodecConfig codecConfig,		private int getPrioitizedCodecType(BluetoothCodecConfig codecConfig,
	BluetoothCodecConfig[] selectableCodecs) {		List<BluetoothCodecConfig> selectableCodecs) {
	BluetoothCodecConfig prioritizedCodecConfig = codecConfig;		BluetoothCodecConfig prioritizedCodecConfig = codecConfig;
	for (BluetoothCodecConfig config : selectableCodecs) {		for (BluetoothCodecConfig config : selectableCodecs) {
	if (prioritizedCodecConfig == null) {		if (prioritizedCodecConfig == null) {
	@@ -233,36 +233,31 @@ class A2dpCodecConfig {

	BluetoothCodecConfig codecConfig;		BluetoothCodecConfig codecConfig;
	BluetoothCodecConfig[] codecConfigArray =		BluetoothCodecConfig[] codecConfigArray =
	new BluetoothCodecConfig[BluetoothCodecConfig.SOURCE_CODEC_TYPE_MAX];		new BluetoothCodecConfig[BluetoothCodecConfig.getMaxCodecType()];
	codecConfig = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,		codecConfig = new BluetoothCodecConfig.Builder()
	mA2dpSourceCodecPrioritySbc, BluetoothCodecConfig.SAMPLE_RATE_NONE,		.setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC)
	BluetoothCodecConfig.BITS_PER_SAMPLE_NONE, BluetoothCodecConfig		.setCodecPriority(mA2dpSourceCodecPrioritySbc)
	.CHANNEL_MODE_NONE, 0 /* codecSpecific1 */,		.build();
	0 /* codecSpecific2 /, 0 / codecSpecific3 /, 0 / codecSpecific4 */);
	codecConfigArray[0] = codecConfig;		codecConfigArray[0] = codecConfig;
	codecConfig = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,		codecConfig = new BluetoothCodecConfig.Builder()
	mA2dpSourceCodecPriorityAac, BluetoothCodecConfig.SAMPLE_RATE_NONE,		.setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC)
	BluetoothCodecConfig.BITS_PER_SAMPLE_NONE, BluetoothCodecConfig		.setCodecPriority(mA2dpSourceCodecPriorityAac)
	.CHANNEL_MODE_NONE, 0 /* codecSpecific1 */,		.build();
	0 /* codecSpecific2 /, 0 / codecSpecific3 /, 0 / codecSpecific4 */);
	codecConfigArray[1] = codecConfig;		codecConfigArray[1] = codecConfig;
	codecConfig = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX,		codecConfig = new BluetoothCodecConfig.Builder()
	mA2dpSourceCodecPriorityAptx, BluetoothCodecConfig.SAMPLE_RATE_NONE,		.setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX)
	BluetoothCodecConfig.BITS_PER_SAMPLE_NONE, BluetoothCodecConfig		.setCodecPriority(mA2dpSourceCodecPriorityAptx)
	.CHANNEL_MODE_NONE, 0 /* codecSpecific1 */,		.build();
	0 /* codecSpecific2 /, 0 / codecSpecific3 /, 0 / codecSpecific4 */);
	codecConfigArray[2] = codecConfig;		codecConfigArray[2] = codecConfig;
	codecConfig = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD,		codecConfig = new BluetoothCodecConfig.Builder()
	mA2dpSourceCodecPriorityAptxHd, BluetoothCodecConfig.SAMPLE_RATE_NONE,		.setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD)
	BluetoothCodecConfig.BITS_PER_SAMPLE_NONE, BluetoothCodecConfig		.setCodecPriority(mA2dpSourceCodecPriorityAptxHd)
	.CHANNEL_MODE_NONE, 0 /* codecSpecific1 */,		.build();
	0 /* codecSpecific2 /, 0 / codecSpecific3 /, 0 / codecSpecific4 */);
	codecConfigArray[3] = codecConfig;		codecConfigArray[3] = codecConfig;
	codecConfig = new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC,		codecConfig = new BluetoothCodecConfig.Builder()
	mA2dpSourceCodecPriorityLdac, BluetoothCodecConfig.SAMPLE_RATE_NONE,		.setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC)
	BluetoothCodecConfig.BITS_PER_SAMPLE_NONE, BluetoothCodecConfig		.setCodecPriority(mA2dpSourceCodecPriorityLdac)
	.CHANNEL_MODE_NONE, 0 /* codecSpecific1 */,		.build();
	0 /* codecSpecific2 /, 0 / codecSpecific3 /, 0 / codecSpecific4 */);
	codecConfigArray[4] = codecConfig;		codecConfigArray[4] = codecConfig;

	return codecConfigArray;		return codecConfigArray;

android/app/src/com/android/bluetooth/a2dp/A2dpNativeInterface.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@
	*/		*/
	package com.android.bluetooth.a2dp;		package com.android.bluetooth.a2dp;

	import android.annotation.RequiresPermission;
	import android.bluetooth.BluetoothA2dp;		import android.bluetooth.BluetoothA2dp;
	import android.bluetooth.BluetoothAdapter;		import android.bluetooth.BluetoothAdapter;
	import android.bluetooth.BluetoothCodecConfig;		import android.bluetooth.BluetoothCodecConfig;
	@@ -33,6 +32,8 @@ import com.android.bluetooth.Utils;
	import com.android.internal.annotations.GuardedBy;		import com.android.internal.annotations.GuardedBy;
	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;

			import java.util.Arrays;

	/**		/**
	* A2DP Native Interface to/from JNI.		* A2DP Native Interface to/from JNI.
	*/		*/
	@@ -197,8 +198,8 @@ public class A2dpNativeInterface {
	A2dpStackEvent event = new A2dpStackEvent(A2dpStackEvent.EVENT_TYPE_CODEC_CONFIG_CHANGED);		A2dpStackEvent event = new A2dpStackEvent(A2dpStackEvent.EVENT_TYPE_CODEC_CONFIG_CHANGED);
	event.device = getDevice(address);		event.device = getDevice(address);
	event.codecStatus = new BluetoothCodecStatus(newCodecConfig,		event.codecStatus = new BluetoothCodecStatus(newCodecConfig,
	codecsLocalCapabilities,		Arrays.asList(codecsLocalCapabilities),
	codecsSelectableCapabilities);		Arrays.asList(codecsSelectableCapabilities));
	if (DBG) {		if (DBG) {
	Log.d(TAG, "onCodecConfigChanged: " + event);		Log.d(TAG, "onCodecConfigChanged: " + event);
	}		}

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -948,7 +948,8 @@ public class A2dpService extends ProfileService {
	codecConfig.getBitsPerSample(), codecConfig.getChannelMode(),		codecConfig.getBitsPerSample(), codecConfig.getChannelMode(),
	codecConfig.getCodecSpecific1(), codecConfig.getCodecSpecific2(),		codecConfig.getCodecSpecific1(), codecConfig.getCodecSpecific2(),
	codecConfig.getCodecSpecific3(), codecConfig.getCodecSpecific4(), metricId);		codecConfig.getCodecSpecific3(), codecConfig.getCodecSpecific4(), metricId);
	BluetoothCodecConfig[] codecCapabilities = codecStatus.getCodecsSelectableCapabilities();		List<BluetoothCodecConfig> codecCapabilities =
			codecStatus.getCodecsSelectableCapabilities();
	for (BluetoothCodecConfig codecCapability : codecCapabilities) {		for (BluetoothCodecConfig codecCapability : codecCapabilities) {
	BluetoothStatsLog.write(BluetoothStatsLog.BLUETOOTH_A2DP_CODEC_CAPABILITY_CHANGED,		BluetoothStatsLog.write(BluetoothStatsLog.BLUETOOTH_A2DP_CODEC_CAPABILITY_CHANGED,
	mAdapterService.obfuscateAddress(device), codecCapability.getCodecType(),		mAdapterService.obfuscateAddress(device), codecCapability.getCodecType(),

android/app/src/com/android/bluetooth/a2dp/A2dpStateMachine.java

+14 −4

Original line number	Original line	Diff line number	Diff line
	@@ -66,6 +66,7 @@ import com.android.internal.util.StateMachine;
	import java.io.FileDescriptor;		import java.io.FileDescriptor;
	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.io.StringWriter;		import java.io.StringWriter;
			import java.util.List;
	import java.util.Objects;		import java.util.Objects;
	import java.util.Scanner;		import java.util.Scanner;

	@@ -716,12 +717,21 @@ final class A2dpStateMachine extends StateMachine {

	private static boolean sameSelectableCodec(BluetoothCodecStatus prevCodecStatus,		private static boolean sameSelectableCodec(BluetoothCodecStatus prevCodecStatus,
	BluetoothCodecStatus newCodecStatus) {		BluetoothCodecStatus newCodecStatus) {
	if (prevCodecStatus == null) {		if (prevCodecStatus == null \|\| newCodecStatus == null) {
	return false;		return false;
	}		}
	return BluetoothCodecStatus.sameCapabilities(		List<BluetoothCodecConfig> c1 = prevCodecStatus.getCodecsSelectableCapabilities();
	prevCodecStatus.getCodecsSelectableCapabilities(),		List<BluetoothCodecConfig> c2 = newCodecStatus.getCodecsSelectableCapabilities();
	newCodecStatus.getCodecsSelectableCapabilities());		if (c1 == null) {
			return (c2 == null);
			}
			if (c2 == null) {
			return false;
			}
			if (c1.size() != c2.size()) {
			return false;
			}
			return c1.containsAll(c2);
	}		}

	private static String messageWhatToString(int what) {		private static String messageWhatToString(int what) {

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpCodecConfigTest.java

+60 −36

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,8 @@ import org.junit.runner.RunWith;
	import org.mockito.Mock;		import org.mockito.Mock;
	import org.mockito.MockitoAnnotations;		import org.mockito.MockitoAnnotations;

			import java.util.Arrays;

	@MediumTest		@MediumTest
	@RunWith(AndroidJUnit4.class)		@RunWith(AndroidJUnit4.class)
	public class A2dpCodecConfigTest {		public class A2dpCodecConfigTest {
	@@ -66,34 +68,34 @@ public class A2dpCodecConfigTest {
	private static final int PRIORITY_HIGH = 1000000;		private static final int PRIORITY_HIGH = 1000000;

	private static final BluetoothCodecConfig[] sCodecCapabilities = new BluetoothCodecConfig[] {		private static final BluetoothCodecConfig[] sCodecCapabilities = new BluetoothCodecConfig[] {
	new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,		buildBluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
	SBC_PRIORITY_DEFAULT,		SBC_PRIORITY_DEFAULT,
	BluetoothCodecConfig.SAMPLE_RATE_44100,		BluetoothCodecConfig.SAMPLE_RATE_44100,
	BluetoothCodecConfig.BITS_PER_SAMPLE_16,		BluetoothCodecConfig.BITS_PER_SAMPLE_16,
	BluetoothCodecConfig.CHANNEL_MODE_MONO		BluetoothCodecConfig.CHANNEL_MODE_MONO
	\| BluetoothCodecConfig.CHANNEL_MODE_STEREO,		\| BluetoothCodecConfig.CHANNEL_MODE_STEREO,
	0, 0, 0, 0), // Codec-specific fields		0, 0, 0, 0), // Codec-specific fields
	new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,		buildBluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
	AAC_PRIORITY_DEFAULT,		AAC_PRIORITY_DEFAULT,
	BluetoothCodecConfig.SAMPLE_RATE_44100,		BluetoothCodecConfig.SAMPLE_RATE_44100,
	BluetoothCodecConfig.BITS_PER_SAMPLE_16,		BluetoothCodecConfig.BITS_PER_SAMPLE_16,
	BluetoothCodecConfig.CHANNEL_MODE_STEREO,		BluetoothCodecConfig.CHANNEL_MODE_STEREO,
	0, 0, 0, 0), // Codec-specific fields		0, 0, 0, 0), // Codec-specific fields
	new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX,		buildBluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX,
	APTX_PRIORITY_DEFAULT,		APTX_PRIORITY_DEFAULT,
	BluetoothCodecConfig.SAMPLE_RATE_44100		BluetoothCodecConfig.SAMPLE_RATE_44100
	\| BluetoothCodecConfig.SAMPLE_RATE_48000,		\| BluetoothCodecConfig.SAMPLE_RATE_48000,
	BluetoothCodecConfig.BITS_PER_SAMPLE_16,		BluetoothCodecConfig.BITS_PER_SAMPLE_16,
	BluetoothCodecConfig.CHANNEL_MODE_STEREO,		BluetoothCodecConfig.CHANNEL_MODE_STEREO,
	0, 0, 0, 0), // Codec-specific fields		0, 0, 0, 0), // Codec-specific fields
	new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD,		buildBluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD,
	APTX_HD_PRIORITY_DEFAULT,		APTX_HD_PRIORITY_DEFAULT,
	BluetoothCodecConfig.SAMPLE_RATE_44100		BluetoothCodecConfig.SAMPLE_RATE_44100
	\| BluetoothCodecConfig.SAMPLE_RATE_48000,		\| BluetoothCodecConfig.SAMPLE_RATE_48000,
	BluetoothCodecConfig.BITS_PER_SAMPLE_24,		BluetoothCodecConfig.BITS_PER_SAMPLE_24,
	BluetoothCodecConfig.CHANNEL_MODE_STEREO,		BluetoothCodecConfig.CHANNEL_MODE_STEREO,
	0, 0, 0, 0), // Codec-specific fields		0, 0, 0, 0), // Codec-specific fields
	new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC,		buildBluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC,
	LDAC_PRIORITY_DEFAULT,		LDAC_PRIORITY_DEFAULT,
	BluetoothCodecConfig.SAMPLE_RATE_44100		BluetoothCodecConfig.SAMPLE_RATE_44100
	\| BluetoothCodecConfig.SAMPLE_RATE_48000		\| BluetoothCodecConfig.SAMPLE_RATE_48000
	@@ -107,31 +109,31 @@ public class A2dpCodecConfigTest {
	};		};

	private static final BluetoothCodecConfig[] sDefaultCodecConfigs = new BluetoothCodecConfig[] {		private static final BluetoothCodecConfig[] sDefaultCodecConfigs = new BluetoothCodecConfig[] {
	new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,		buildBluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
	SBC_PRIORITY_DEFAULT,		SBC_PRIORITY_DEFAULT,
	BluetoothCodecConfig.SAMPLE_RATE_44100,		BluetoothCodecConfig.SAMPLE_RATE_44100,
	BluetoothCodecConfig.BITS_PER_SAMPLE_16,		BluetoothCodecConfig.BITS_PER_SAMPLE_16,
	BluetoothCodecConfig.CHANNEL_MODE_STEREO,		BluetoothCodecConfig.CHANNEL_MODE_STEREO,
	0, 0, 0, 0), // Codec-specific fields		0, 0, 0, 0), // Codec-specific fields
	new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,		buildBluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC,
	AAC_PRIORITY_DEFAULT,		AAC_PRIORITY_DEFAULT,
	BluetoothCodecConfig.SAMPLE_RATE_44100,		BluetoothCodecConfig.SAMPLE_RATE_44100,
	BluetoothCodecConfig.BITS_PER_SAMPLE_16,		BluetoothCodecConfig.BITS_PER_SAMPLE_16,
	BluetoothCodecConfig.CHANNEL_MODE_STEREO,		BluetoothCodecConfig.CHANNEL_MODE_STEREO,
	0, 0, 0, 0), // Codec-specific fields		0, 0, 0, 0), // Codec-specific fields
	new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX,		buildBluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX,
	APTX_PRIORITY_DEFAULT,		APTX_PRIORITY_DEFAULT,
	BluetoothCodecConfig.SAMPLE_RATE_48000,		BluetoothCodecConfig.SAMPLE_RATE_48000,
	BluetoothCodecConfig.BITS_PER_SAMPLE_16,		BluetoothCodecConfig.BITS_PER_SAMPLE_16,
	BluetoothCodecConfig.CHANNEL_MODE_STEREO,		BluetoothCodecConfig.CHANNEL_MODE_STEREO,
	0, 0, 0, 0), // Codec-specific fields		0, 0, 0, 0), // Codec-specific fields
	new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD,		buildBluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD,
	APTX_HD_PRIORITY_DEFAULT,		APTX_HD_PRIORITY_DEFAULT,
	BluetoothCodecConfig.SAMPLE_RATE_48000,		BluetoothCodecConfig.SAMPLE_RATE_48000,
	BluetoothCodecConfig.BITS_PER_SAMPLE_24,		BluetoothCodecConfig.BITS_PER_SAMPLE_24,
	BluetoothCodecConfig.CHANNEL_MODE_STEREO,		BluetoothCodecConfig.CHANNEL_MODE_STEREO,
	0, 0, 0, 0), // Codec-specific fields		0, 0, 0, 0), // Codec-specific fields
	new BluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC,		buildBluetoothCodecConfig(BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC,
	LDAC_PRIORITY_DEFAULT,		LDAC_PRIORITY_DEFAULT,
	BluetoothCodecConfig.SAMPLE_RATE_96000,		BluetoothCodecConfig.SAMPLE_RATE_96000,
	BluetoothCodecConfig.BITS_PER_SAMPLE_32,		BluetoothCodecConfig.BITS_PER_SAMPLE_32,
	@@ -568,8 +570,8 @@ public class A2dpCodecConfigTest {
	@Test		@Test
	public void testDisableOptionalCodecs() {		public void testDisableOptionalCodecs() {
	BluetoothCodecConfig[] codecConfigsArray =		BluetoothCodecConfig[] codecConfigsArray =
	new BluetoothCodecConfig[BluetoothCodecConfig.SOURCE_CODEC_TYPE_MAX];		new BluetoothCodecConfig[BluetoothCodecConfig.getMaxCodecType()];
	codecConfigsArray[0] = new BluetoothCodecConfig(		codecConfigsArray[0] = buildBluetoothCodecConfig(
	BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,		BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
	BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST,		BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST,
	BluetoothCodecConfig.SAMPLE_RATE_NONE,		BluetoothCodecConfig.SAMPLE_RATE_NONE,
	@@ -601,8 +603,8 @@ public class A2dpCodecConfigTest {
	@Test		@Test
	public void testEnableOptionalCodecs() {		public void testEnableOptionalCodecs() {
	BluetoothCodecConfig[] codecConfigsArray =		BluetoothCodecConfig[] codecConfigsArray =
	new BluetoothCodecConfig[BluetoothCodecConfig.SOURCE_CODEC_TYPE_MAX];		new BluetoothCodecConfig[BluetoothCodecConfig.getMaxCodecType()];
	codecConfigsArray[0] = new BluetoothCodecConfig(		codecConfigsArray[0] = buildBluetoothCodecConfig(
	BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,		BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC,
	SBC_PRIORITY_DEFAULT,		SBC_PRIORITY_DEFAULT,
	BluetoothCodecConfig.SAMPLE_RATE_NONE,		BluetoothCodecConfig.SAMPLE_RATE_NONE,
	@@ -634,7 +636,7 @@ public class A2dpCodecConfigTest {
	if (codecConfig.getCodecType() != codecType) {		if (codecConfig.getCodecType() != codecType) {
	continue;		continue;
	}		}
	return new BluetoothCodecConfig(		return buildBluetoothCodecConfig(
	codecConfig.getCodecType(),		codecConfig.getCodecType(),
	(codecPriority != BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT		(codecPriority != BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT
	? codecPriority : codecConfig.getCodecPriority()),		? codecPriority : codecConfig.getCodecPriority()),
	@@ -653,7 +655,7 @@ public class A2dpCodecConfigTest {
	if (codecCapabilities.getCodecType() != codecType) {		if (codecCapabilities.getCodecType() != codecType) {
	continue;		continue;
	}		}
	return new BluetoothCodecConfig(		return buildBluetoothCodecConfig(
	codecCapabilities.getCodecType(), codecCapabilities.getCodecPriority(),		codecCapabilities.getCodecType(), codecCapabilities.getCodecPriority(),
	codecCapabilities.getSampleRate(), codecCapabilities.getBitsPerSample(),		codecCapabilities.getSampleRate(), codecCapabilities.getBitsPerSample(),
	codecCapabilities.getChannelMode(), codecCapabilities.getCodecSpecific1(),		codecCapabilities.getChannelMode(), codecCapabilities.getCodecSpecific1(),
	@@ -670,7 +672,7 @@ public class A2dpCodecConfigTest {
	BluetoothCodecConfig oldCodecConfig =		BluetoothCodecConfig oldCodecConfig =
	getDefaultCodecConfigByType(oldCodecType, PRIORITY_HIGH);		getDefaultCodecConfigByType(oldCodecType, PRIORITY_HIGH);
	BluetoothCodecConfig[] newCodecConfigsArray = new BluetoothCodecConfig[] {		BluetoothCodecConfig[] newCodecConfigsArray = new BluetoothCodecConfig[] {
	new BluetoothCodecConfig(newCodecType,		buildBluetoothCodecConfig(newCodecType,
	PRIORITY_HIGH,		PRIORITY_HIGH,
	sampleRate, bitsPerSample, channelMode,		sampleRate, bitsPerSample, channelMode,
	0, 0, 0, 0) // Codec-specific fields		0, 0, 0, 0) // Codec-specific fields
	@@ -699,8 +701,8 @@ public class A2dpCodecConfigTest {
	};		};
	}		}
	BluetoothCodecStatus codecStatus = new BluetoothCodecStatus(oldCodecConfig,		BluetoothCodecStatus codecStatus = new BluetoothCodecStatus(oldCodecConfig,
	sCodecCapabilities,		Arrays.asList(sCodecCapabilities),
	optionalCodecsArray);		Arrays.asList(optionalCodecsArray));
	mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,		mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,
	codecStatus,		codecStatus,
	newCodecConfigsArray[0]);		newCodecConfigsArray[0]);
	@@ -724,7 +726,9 @@ public class A2dpCodecConfigTest {

	// 2. mandatory + old + new codecs only		// 2. mandatory + old + new codecs only
	BluetoothCodecStatus codecStatus =		BluetoothCodecStatus codecStatus =
	new BluetoothCodecStatus(oldCodecConfig, sCodecCapabilities, minimumCodecsArray);		new BluetoothCodecStatus(oldCodecConfig,
			Arrays.asList(sCodecCapabilities),
			Arrays.asList(minimumCodecsArray));
	mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,		mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,
	codecStatus,		codecStatus,
	newCodecConfigsArray[0]);		newCodecConfigsArray[0]);
	@@ -733,8 +737,8 @@ public class A2dpCodecConfigTest {

	// 3. all codecs were selectable		// 3. all codecs were selectable
	codecStatus = new BluetoothCodecStatus(oldCodecConfig,		codecStatus = new BluetoothCodecStatus(oldCodecConfig,
	sCodecCapabilities,		Arrays.asList(sCodecCapabilities),
	sCodecCapabilities);		Arrays.asList(sCodecCapabilities));
	mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,		mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,
	codecStatus,		codecStatus,
	newCodecConfigsArray[0]);		newCodecConfigsArray[0]);
	@@ -747,7 +751,7 @@ public class A2dpCodecConfigTest {
	BluetoothCodecConfig codecDefaultTemp =		BluetoothCodecConfig codecDefaultTemp =
	getDefaultCodecConfigByType(oldCodecType, PRIORITY_HIGH);		getDefaultCodecConfigByType(oldCodecType, PRIORITY_HIGH);
	BluetoothCodecConfig oldCodecConfig =		BluetoothCodecConfig oldCodecConfig =
	new BluetoothCodecConfig(codecDefaultTemp.getCodecType(),		buildBluetoothCodecConfig(codecDefaultTemp.getCodecType(),
	codecDefaultTemp.getCodecPriority(),		codecDefaultTemp.getCodecPriority(),
	codecDefaultTemp.getSampleRate(),		codecDefaultTemp.getSampleRate(),
	codecDefaultTemp.getBitsPerSample(),		codecDefaultTemp.getBitsPerSample(),
	@@ -755,7 +759,7 @@ public class A2dpCodecConfigTest {
	oldCodecSpecific, 0, 0, 0); // Codec-specific fields		oldCodecSpecific, 0, 0, 0); // Codec-specific fields
	codecDefaultTemp = getDefaultCodecConfigByType(newCodecType, PRIORITY_HIGH);		codecDefaultTemp = getDefaultCodecConfigByType(newCodecType, PRIORITY_HIGH);
	BluetoothCodecConfig[] newCodecConfigsArray = new BluetoothCodecConfig[] {		BluetoothCodecConfig[] newCodecConfigsArray = new BluetoothCodecConfig[] {
	new BluetoothCodecConfig(codecDefaultTemp.getCodecType(),		buildBluetoothCodecConfig(codecDefaultTemp.getCodecType(),
	codecDefaultTemp.getCodecPriority(),		codecDefaultTemp.getCodecPriority(),
	codecDefaultTemp.getSampleRate(),		codecDefaultTemp.getSampleRate(),
	codecDefaultTemp.getBitsPerSample(),		codecDefaultTemp.getBitsPerSample(),
	@@ -763,8 +767,8 @@ public class A2dpCodecConfigTest {
	newCodecSpecific, 0, 0, 0) // Codec-specific fields		newCodecSpecific, 0, 0, 0) // Codec-specific fields
	};		};
	BluetoothCodecStatus codecStatus = new BluetoothCodecStatus(oldCodecConfig,		BluetoothCodecStatus codecStatus = new BluetoothCodecStatus(oldCodecConfig,
	sCodecCapabilities,		Arrays.asList(sCodecCapabilities),
	sCodecCapabilities);		Arrays.asList(sCodecCapabilities));
	mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,		mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,
	codecStatus,		codecStatus,
	newCodecConfigsArray[0]);		newCodecConfigsArray[0]);
	@@ -792,8 +796,8 @@ public class A2dpCodecConfigTest {
	BluetoothCodecConfig[] poorCodecsArray = new BluetoothCodecConfig[]		BluetoothCodecConfig[] poorCodecsArray = new BluetoothCodecConfig[]
	{getCodecCapabilitiesByType(oldCodecType)};		{getCodecCapabilitiesByType(oldCodecType)};
	BluetoothCodecStatus codecStatus = new BluetoothCodecStatus(oldCodecConfig,		BluetoothCodecStatus codecStatus = new BluetoothCodecStatus(oldCodecConfig,
	sCodecCapabilities,		Arrays.asList(sCodecCapabilities),
	poorCodecsArray);		Arrays.asList(poorCodecsArray));
	mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,		mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,
	codecStatus,		codecStatus,
	newCodecConfigsArray[0]);		newCodecConfigsArray[0]);
	@@ -813,8 +817,8 @@ public class A2dpCodecConfigTest {
	getCodecCapabilitiesByType(newCodecType)		getCodecCapabilitiesByType(newCodecType)
	};		};
	BluetoothCodecStatus codecStatus = new BluetoothCodecStatus(oldCodecConfig,		BluetoothCodecStatus codecStatus = new BluetoothCodecStatus(oldCodecConfig,
	sCodecCapabilities,		Arrays.asList(sCodecCapabilities),
	poorCodecsArray);		Arrays.asList(poorCodecsArray));
	mA2dpCodecConfig.setCodecConfigPreference(		mA2dpCodecConfig.setCodecConfigPreference(
	mTestDevice, codecStatus, newCodecConfigsArray[0]);		mTestDevice, codecStatus, newCodecConfigsArray[0]);
	verify(mA2dpNativeInterface, times(0))		verify(mA2dpNativeInterface, times(0))
	@@ -826,8 +830,8 @@ public class A2dpCodecConfigTest {
	getCodecCapabilitiesByType(oldCodecType)		getCodecCapabilitiesByType(oldCodecType)
	};		};
	codecStatus = new BluetoothCodecStatus(oldCodecConfig,		codecStatus = new BluetoothCodecStatus(oldCodecConfig,
	sCodecCapabilities,		Arrays.asList(sCodecCapabilities),
	poorCodecsArray);		Arrays.asList(poorCodecsArray));
	mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,		mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,
	codecStatus,		codecStatus,
	newCodecConfigsArray[0]);		newCodecConfigsArray[0]);
	@@ -857,7 +861,9 @@ public class A2dpCodecConfigTest {
	BluetoothCodecConfig[] poorCodecsArray = new BluetoothCodecConfig[]		BluetoothCodecConfig[] poorCodecsArray = new BluetoothCodecConfig[]
	{getCodecCapabilitiesByType(oldCodecType)};		{getCodecCapabilitiesByType(oldCodecType)};
	BluetoothCodecStatus codecStatus =		BluetoothCodecStatus codecStatus =
	new BluetoothCodecStatus(oldCodecConfig, sCodecCapabilities, poorCodecsArray);		new BluetoothCodecStatus(oldCodecConfig,
			Arrays.asList(sCodecCapabilities),
			Arrays.asList(poorCodecsArray));
	mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,		mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,
	codecStatus,		codecStatus,
	newCodecConfigsArray[0]);		newCodecConfigsArray[0]);
	@@ -880,7 +886,9 @@ public class A2dpCodecConfigTest {
	// 3. mandatory + old + new codecs only		// 3. mandatory + old + new codecs only
	int invokedCounter = (isMinimumCodecsArraySelectable ? 1 : 0);		int invokedCounter = (isMinimumCodecsArraySelectable ? 1 : 0);
	BluetoothCodecStatus codecStatus =		BluetoothCodecStatus codecStatus =
	new BluetoothCodecStatus(oldCodecConfig, sCodecCapabilities, minimumCodecsArray);		new BluetoothCodecStatus(oldCodecConfig,
			Arrays.asList(sCodecCapabilities),
			Arrays.asList(minimumCodecsArray));
	mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,		mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,
	codecStatus,		codecStatus,
	newCodecConfigsArray[0]);		newCodecConfigsArray[0]);
	@@ -890,12 +898,28 @@ public class A2dpCodecConfigTest {
	// 4. all codecs were selectable		// 4. all codecs were selectable
	invokedCounter += (shouldApplyWhenAllSelectable ? 1 : 0);		invokedCounter += (shouldApplyWhenAllSelectable ? 1 : 0);
	codecStatus = new BluetoothCodecStatus(oldCodecConfig,		codecStatus = new BluetoothCodecStatus(oldCodecConfig,
	sCodecCapabilities,		Arrays.asList(sCodecCapabilities),
	sCodecCapabilities);		Arrays.asList(sCodecCapabilities));
	mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,		mA2dpCodecConfig.setCodecConfigPreference(mTestDevice,
	codecStatus,		codecStatus,
	newCodecConfigsArray[0]);		newCodecConfigsArray[0]);
	verify(mA2dpNativeInterface, times(invokedCounter))		verify(mA2dpNativeInterface, times(invokedCounter))
	.setCodecConfigPreference(mTestDevice, newCodecConfigsArray);		.setCodecConfigPreference(mTestDevice, newCodecConfigsArray);
	}		}

			private static BluetoothCodecConfig buildBluetoothCodecConfig(int sourceCodecType,
			int codecPriority, int sampleRate, int bitsPerSample, int channelMode,
			long codecSpecific1, long codecSpecific2, long codecSpecific3, long codecSpecific4) {
			return new BluetoothCodecConfig.Builder()
			.setCodecType(sourceCodecType)
			.setCodecPriority(codecPriority)
			.setSampleRate(sampleRate)
			.setBitsPerSample(bitsPerSample)
			.setChannelMode(channelMode)
			.setCodecSpecific1(codecSpecific1)
			.setCodecSpecific2(codecSpecific2)
			.setCodecSpecific3(codecSpecific3)
			.setCodecSpecific4(codecSpecific4)
			.build();
			}
	}		}