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

Commit de3cfc42 authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "add GMAP profile and UUID" into main am: 6a31c29d 

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



Change-Id: I8386f9d8028cffa50dcbf451408e2ec3706c2bb4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0714f91d 6a31c29d

framework/java/android/bluetooth/BluetoothProfile.java

+8 −1
Original line number Diff line number Diff line
@@ -237,13 +237,20 @@ public interface BluetoothProfile { 
     */

    int BATTERY = 30;



    /**

     * Gaming Audio Profile

     *

     * @hide

     */

    int GMAP = 31;



    /**

     * Max profile ID. This value should be updated whenever a new profile is added to match the

     * largest value assigned to a profile.

     *

     * @hide

     */

    int MAX_PROFILE_ID = 30;

    int MAX_PROFILE_ID = 31;



    /**

     * Default priority for devices that we try to auto-connect to and allow incoming connections

framework/java/android/bluetooth/BluetoothUuid.java

+9 −0
Original line number Diff line number Diff line
@@ -302,6 +302,15 @@ public final class BluetoothUuid { 
    public static final ParcelUuid GENERIC_MEDIA_CONTROL =

            ParcelUuid.fromString("00001849-0000-1000-8000-00805F9B34FB");



    /**

     * UUID corresponding to the Gaming Audio Profile (GMAP).

     *

     * @hide

     */

    @NonNull

    public static final ParcelUuid GMAP =

            ParcelUuid.fromString("00001858-0000-1000-8000-00805F9B34FB");



    /**

     * UUID corresponding to the Media Control Service.

     *