Merge TP1A.220328.001

Change-Id: I5f07094ba2fb3991da03673f97d2957b1f68018b

1 files changed, 44 insertions, 0 deletions

diff --git a/framework/java/android/bluetooth/BluetoothCodecConfig.java b/framework/java/android/bluetooth/BluetoothCodecConfig.java
index 4cbf956c24..d1fb561107 100644
--- a/framework/java/android/bluetooth/BluetoothCodecConfig.java
+++ b/framework/java/android/bluetooth/BluetoothCodecConfig.java
@@ -566,6 +566,17 @@ public final class BluetoothCodecConfig implements Parcelable {
      * Returns the codec specific value1.
      * As the value and usage differ for each codec, please refer to the concerned
      * codec specification to obtain the codec specific information.
+     *
+     * <p>See section 4.3.2 of the Bluetooth A2dp specification for SBC codec specific
+     * information elements.
+     * <p>See section 4.4.2 of the Bluetooth A2dp specification for MPEG-1,2 Audio
+     * codec specific information elements.
+     * <p>See section 4.5.2 of the Bluetooth A2dp specification for MPEG-2, 4 AAC
+     * codec specific information elements.
+     * <p>See section 4.6.2 of the Bluetooth A2dp specification for ATRAC family
+     * codec specific information elements.
+     * <p>See section 4.7.2 of the Bluetooth A2dp specification for Vendor Specific A2DP
+     * codec specific information elements.
      */
     public long getCodecSpecific1() {
         return mCodecSpecific1;
@@ -575,6 +586,17 @@ public final class BluetoothCodecConfig implements Parcelable {
      * Returns the codec specific value2.
      * As the value and usage differ for each codec, please refer to the concerned
      * codec specification to obtain the codec specific information.
+     *
+     * <p>See section 4.3.2 of the Bluetooth A2dp specification for SBC codec specific
+     * information elements.
+     * <p>See section 4.4.2 of the Bluetooth A2dp specification for MPEG-1,2 Audio
+     * codec specific information elements.
+     * <p>See section 4.5.2 of the Bluetooth A2dp specification for MPEG-2, 4 AAC
+     * codec specific information elements.
+     * <p>See section 4.6.2 of the Bluetooth A2dp specification for ATRAC family
+     * codec specific information elements.
+     * <p>See section 4.7.2 of the Bluetooth A2dp specification for Vendor Specific A2DP
+     * codec specific information elements.
      */
     public long getCodecSpecific2() {
         return mCodecSpecific2;
@@ -584,6 +606,17 @@ public final class BluetoothCodecConfig implements Parcelable {
      * Returns the codec specific value3.
      * As the value and usage differ for each codec, please refer to the concerned
      * codec specification to obtain the codec specific information.
+     *
+     * <p>See section 4.3.2 of the Bluetooth A2dp specification for SBC codec specific
+     * information elements.
+     * <p>See section 4.4.2 of the Bluetooth A2dp specification for MPEG-1,2 Audio
+     * codec specific information elements.
+     * <p>See section 4.5.2 of the Bluetooth A2dp specification for MPEG-2, 4 AAC
+     * codec specific information elements.
+     * <p>See section 4.6.2 of the Bluetooth A2dp specification for ATRAC family
+     * codec specific information elements.
+     * <p>See section 4.7.2 of the Bluetooth A2dp specification for Vendor Specific A2DP
+     * codec specific information elements.
      */
     public long getCodecSpecific3() {
         return mCodecSpecific3;
@@ -593,6 +626,17 @@ public final class BluetoothCodecConfig implements Parcelable {
      * Returns the codec specific value4.
      * As the value and usage differ for each codec, please refer to the concerned
      * codec specification to obtain the codec specific information.
+     *
+     * <p>See section 4.3.2 of the Bluetooth A2dp specification for SBC codec specific
+     * information elements.
+     * <p>See section 4.4.2 of the Bluetooth A2dp specification for MPEG-1,2 Audio
+     * codec specific information elements.
+     * <p>See section 4.5.2 of the Bluetooth A2dp specification for MPEG-2, 4 AAC
+     * codec specific information elements.
+     * <p>See section 4.6.2 of the Bluetooth A2dp specification for ATRAC family
+     * codec specific information elements.
+     * <p>See section 4.7.2 of the Bluetooth A2dp specification for Vendor Specific A2DP
+     * codec specific information elements.
      */
     public long getCodecSpecific4() {
         return mCodecSpecific4;