summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorPavlin Radoslavov <pavlin@google.com>2017-01-26 19:31:07 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-26 19:31:07 +0000
commit78798cc13dece927e86b462bece6155c06b360bc (patch)
tree1b00a6945bdee289f44b97d8783f1d6e6cdcfb47 /core/java/android
parent666e59f911376e3c9c04b456a0d589643955e167 (diff)
parentd36420838860305096bf733bab4e180e0529bd62 (diff)
Merge "Integration of the AAC codec for A2DP source" am: 22f97c83fb am: f23e80bb9b
am: d364208388 Change-Id: Ice6067732c4a94d30410a8f90cbea51b869539eb
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/bluetooth/BluetoothCodecConfig.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/bluetooth/BluetoothCodecConfig.java b/core/java/android/bluetooth/BluetoothCodecConfig.java
index 52cd2de4c2b6..a37a0b38aa7c 100644
--- a/core/java/android/bluetooth/BluetoothCodecConfig.java
+++ b/core/java/android/bluetooth/BluetoothCodecConfig.java
@@ -51,9 +51,10 @@ public final class BluetoothCodecConfig implements Parcelable {
// NOTE: The values should be same as those listed in the following file:
// hardware/libhardware/include/hardware/bt_av.h
public static final int SOURCE_CODEC_TYPE_SBC = 0;
- public static final int SOURCE_CODEC_TYPE_APTX = 1;
- public static final int SOURCE_CODEC_TYPE_APTX_HD = 2;
- public static final int SOURCE_CODEC_TYPE_LDAC = 3;
+ public static final int SOURCE_CODEC_TYPE_AAC = 1;
+ public static final int SOURCE_CODEC_TYPE_APTX = 2;
+ public static final int SOURCE_CODEC_TYPE_APTX_HD = 3;
+ public static final int SOURCE_CODEC_TYPE_LDAC = 4;
public static final int SOURCE_CODEC_TYPE_INVALID = 1000 * 1000;