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

Commit 056e3612 authored by Angela Wang's avatar Angela Wang
Browse files

Add MFi HAS uuid with flag 

Some hearing aids that compatible for both ASHA + MFi only carry MFi data when advertising. We can use this MFi uuid to filter out hearing aid device during scanning.

Test: m Bluetooth | no-op change build only is required
Bug: 310543599
Bug: 307890347
Change-Id: I3921f9c5ed8b0b1ecc82b2efc864d3a9b8052732
parent 98d38d11

flags/framework.aconfig

+7 −0
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"



flag {

    name: "mfi_has_uuid"

    namespace: "bluetooth"

    description: "Use MFi HAS uuid to judge if a device is hearing aid"

    bug: "310543599"

}



flag {

    name: "support_metadata_device_types_apis"

    namespace: "bluetooth"

framework/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1066,6 +1066,7 @@ package android.bluetooth { 
    field @NonNull public static final android.os.ParcelUuid MAP;

    field @NonNull public static final android.os.ParcelUuid MAS;

    field @NonNull public static final android.os.ParcelUuid MEDIA_CONTROL;

    field @FlaggedApi("com.android.bluetooth.flags.mfi_has_uuid") @NonNull public static final android.os.ParcelUuid MFI_HAS;

    field @NonNull public static final android.os.ParcelUuid MNS;

    field @NonNull public static final android.os.ParcelUuid NAP;

    field @NonNull public static final android.os.ParcelUuid OBEX_OBJECT_PUSH;

framework/java/android/bluetooth/BluetoothUuid.java

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.bluetooth;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;
@@ -279,6 +280,17 @@ public final class BluetoothUuid { 
    public static final ParcelUuid HAS =

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



    /**

     * UUID corresponding to the Made For iPhone/iPod/iPad Hearing Aid Service (MFi HAS).

     *

     * @hide

     */

    @NonNull

    @SystemApi

    @FlaggedApi("com.android.bluetooth.flags.mfi_has_uuid")

    public static final ParcelUuid MFI_HAS =

            ParcelUuid.fromString("7D74F4BD-C74A-4431-862C-CCE884371592");



    /**

     * UUID corresponding to Audio Stream Control (also known as Bluetooth Low Energy Audio).

     *