Merge "Add system properties to config audio codec priority" into tm-mainline-prod (e451fbc4) · Commits · e / os / android_packages_modules_Bluetooth

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

+19 −6

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.content.Context;
		import android.content.res.Resources;
		import android.content.res.Resources.NotFoundException;
		import android.media.AudioManager;
		import android.os.SystemProperties;
		import android.util.Log;

		import com.android.bluetooth.R;
		@@ -189,7 +190,9 @@ class A2dpCodecConfig {

		int value;
		try {
		value = resources.getInteger(R.integer.a2dp_source_codec_priority_sbc);
		value = SystemProperties.getInt(
		"bluetooth.a2dp.source.sbc_priority.config",
		resources.getInteger(R.integer.a2dp_source_codec_priority_sbc));
		} catch (NotFoundException e) {
		value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
		}
		@@ -199,7 +202,9 @@ class A2dpCodecConfig {
		}

		try {
		value = resources.getInteger(R.integer.a2dp_source_codec_priority_aac);
		value = SystemProperties.getInt(
		"bluetooth.a2dp.source.aac_priority.config",
		resources.getInteger(R.integer.a2dp_source_codec_priority_aac));
		} catch (NotFoundException e) {
		value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
		}
		@@ -209,7 +214,9 @@ class A2dpCodecConfig {
		}

		try {
		value = resources.getInteger(R.integer.a2dp_source_codec_priority_aptx);
		value = SystemProperties.getInt(
		"bluetooth.a2dp.source.aptx_priority.config",
		resources.getInteger(R.integer.a2dp_source_codec_priority_aptx));
		} catch (NotFoundException e) {
		value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
		}
		@@ -219,7 +226,9 @@ class A2dpCodecConfig {
		}

		try {
		value = resources.getInteger(R.integer.a2dp_source_codec_priority_aptx_hd);
		value = SystemProperties.getInt(
		"bluetooth.a2dp.source.aptx_hd_priority.config",
		resources.getInteger(R.integer.a2dp_source_codec_priority_aptx_hd));
		} catch (NotFoundException e) {
		value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
		}
		@@ -229,7 +238,9 @@ class A2dpCodecConfig {
		}

		try {
		value = resources.getInteger(R.integer.a2dp_source_codec_priority_ldac);
		value = SystemProperties.getInt(
		"bluetooth.a2dp.source.ldac_priority.config",
		resources.getInteger(R.integer.a2dp_source_codec_priority_ldac));
		} catch (NotFoundException e) {
		value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
		}
		@@ -239,7 +250,9 @@ class A2dpCodecConfig {
		}

		try {
		value = resources.getInteger(R.integer.a2dp_source_codec_priority_lc3);
		value = SystemProperties.getInt(
		"bluetooth.a2dp.source.lc3_priority.config",
		resources.getInteger(R.integer.a2dp_source_codec_priority_lc3));
		} catch (NotFoundException e) {
		value = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
		}