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

Commit 313ae859 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Hearing Aid profile" 

am: aca4460b64

Change-Id: I2f0367b57ec720c3b46b0f2984b77068db3fa3c1
parents 482bcaf3 3f23873b

framework/java/android/bluetooth/BluetoothAdapter.java

+6 −0
Original line number Diff line number Diff line
@@ -2303,6 +2303,9 @@ public final class BluetoothAdapter { 
        } else if (profile == BluetoothProfile.HID_DEVICE) {

            BluetoothHidDevice hidDevice = new BluetoothHidDevice(context, listener);

            return true;

        } else if (profile == BluetoothProfile.HEARING_AID) {

            BluetoothHearingAid hearingAid = new BluetoothHearingAid(context, listener);

            return true;

        } else {

            return false;

        }
@@ -2385,6 +2388,9 @@ public final class BluetoothAdapter { 
                BluetoothHidDevice hidDevice = (BluetoothHidDevice) proxy;

                hidDevice.close();

                break;

            case BluetoothProfile.HEARING_AID:

                BluetoothHearingAid hearingAid = (BluetoothHearingAid) proxy;

                hearingAid.close();

        }

    }

framework/java/android/bluetooth/BluetoothHearingAid.java

0 → 100644
+693 −0

File added.

Preview size limit exceeded, changes collapsed.

framework/java/android/bluetooth/BluetoothProfile.java

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

    public static final int OPP = 20;



    /**

     * Hearing Aid Device

     *

     * @hide

     */

    int HEARING_AID = 21;



    /**

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

     * the largest value assigned to a profile.

     *

     * @hide

     */

    public static final int MAX_PROFILE_ID = 20;

    int MAX_PROFILE_ID = 21;



    /**

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

framework/java/android/bluetooth/BluetoothUuid.java

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ public final class BluetoothUuid { 
            ParcelUuid.fromString("00001132-0000-1000-8000-00805F9B34FB");

    public static final ParcelUuid SAP =

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

    /* TODO: b/69623109 update this value. It will change to 16bit UUID!! */

    public static final ParcelUuid HearingAid =

            ParcelUuid.fromString("7312C48F-22CC-497F-85FD-A0616A3B9E05");



    public static final ParcelUuid BASE_UUID =

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