Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47a514a9 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "BluetoothCodecType: Re-format the doc comment for getCodecId()" into... 

Merge "BluetoothCodecType: Re-format the doc comment for getCodecId()" into main am: 15fd53bc am: aa8c02d5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3159978



Change-Id: I8baee51cdb80901e6bc845ce393f62e008c3df7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbb82ff1 aa8c02d5

framework/java/android/bluetooth/BluetoothCodecType.java

+14 −4
Original line number Diff line number Diff line
@@ -94,10 +94,20 @@ public final class BluetoothCodecType implements Parcelable { 
    }



    /**

     * Returns the codec unique identifier. The codec identifier is 40 bits, - Bits 0-7: Audio Codec

     * ID, as defined by [ID 6.5.1] 0x00: SBC 0x02: AAC 0xFF: Vendor - Bits 8-23: Company ID, set to

     * 0, if octet 0 is not 0xFF. - Bits 24-39: Vendor-defined codec ID, set to 0, if octet 0 is not

     * 0xFF.

     * Returns the codec unique identifier.

     *

     * <p>The codec identifier is 40 bits:

     *

     * <ul>

     *   <li>Bits 0-7: Audio Codec ID, as defined by [ID 6.5.1]

     *       <ul>

     *         <li>0x00: SBC

     *         <li>0x02: AAC

     *         <li>0xFF: Vendor

     *       </ul>

     *   <li>Bits 8-23: Company ID, set to 0, if octet 0 is not 0xFF.

     *   <li>Bits 24-39: Vendor-defined codec ID, set to 0, if octet 0 is not 0xFF.

     * </ul>

     */

    @FlaggedApi(Flags.FLAG_A2DP_OFFLOAD_CODEC_EXTENSIBILITY)

    public long getCodecId() {