commit 489ce07b81add20ceda6d0e49c57cf470b2577b8
author Pavlin Radoslavov <pavlin@google.com> Tue Feb 07 14:05:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 07 14:05:43 2017 +0000
tree 0fbf03b5c1b30b10f82d9aaff433d7c426d58932
parent f5c7778c7d56bacbb1fa170e17b6167f9179cc94
parent 537eaf0f6eba68a3918c5f34a15ea10753b42348

Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62 am: cd6e0ee19d am: b7067e2b6c
am: 537eaf0f6e

Change-Id: I42186a561d59decb0d811b3f5b8d5bf96df53152

core/java/android/bluetooth/BluetoothCodecConfig.java

diff --git a/core/java/android/bluetooth/BluetoothCodecConfig.java b/core/java/android/bluetooth/BluetoothCodecConfig.java
index a482103..176e48f 100644
--- a/core/java/android/bluetooth/BluetoothCodecConfig.java
+++ b/core/java/android/bluetooth/BluetoothCodecConfig.java
@@ -37,9 +37,11 @@
     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_MAX     = 5;
 
     public static final int SOURCE_CODEC_TYPE_INVALID = 1000 * 1000;
 
+    public static final int CODEC_PRIORITY_DISABLED = -1;
     public static final int CODEC_PRIORITY_DEFAULT = 0;
     public static final int CODEC_PRIORITY_HIGHEST = 1000 * 1000;
 
@@ -72,7 +74,7 @@
 
     public BluetoothCodecConfig(int codecType, int codecPriority,
                                 int sampleRate, int bitsPerSample,
-                                int channelMode,long codecSpecific1,
+                                int channelMode, long codecSpecific1,
                                 long codecSpecific2, long codecSpecific3,
                                 long codecSpecific4) {
         mCodecType = codecType;