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

Commit 1b885617 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Add device type metadata key: carkit + hearingAid" into main

parents 446bb91f 262bf0fb

framework/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -219,8 +219,10 @@ package android.bluetooth { 
    field public static final int BATTERY_LEVEL_UNKNOWN = -1; // 0xffffffff

    field public static final int CONNECTION_ACCESS_NO = 2; // 0x2

    field public static final int CONNECTION_ACCESS_YES = 1; // 0x1

    field @FlaggedApi("com.android.bluetooth.flags.support_metadata_device_types_apis") public static final String DEVICE_TYPE_CARKIT = "Carkit";

    field public static final String DEVICE_TYPE_DEFAULT = "Default";

    field @FlaggedApi("com.android.bluetooth.flags.support_metadata_device_types_apis") public static final String DEVICE_TYPE_HEADSET = "Headset";

    field @FlaggedApi("com.android.bluetooth.flags.support_metadata_device_types_apis") public static final String DEVICE_TYPE_HEARING_AID = "HearingAid";

    field @FlaggedApi("com.android.bluetooth.flags.support_metadata_device_types_apis") public static final String DEVICE_TYPE_SPEAKER = "Speaker";

    field public static final String DEVICE_TYPE_STYLUS = "Stylus";

    field public static final String DEVICE_TYPE_UNTETHERED_HEADSET = "Untethered Headset";

framework/java/android/bluetooth/BluetoothDevice.java

+20 −0
Original line number Diff line number Diff line
@@ -886,6 +886,26 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @SystemApi

    public static final String DEVICE_TYPE_HEADSET = "Headset";



    /**

     * Device type which is used in METADATA_DEVICE_TYPE

     * Indicates this Bluetooth device is a Carkit.

     *

     * @hide

     */

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

    @SystemApi

    public static final String DEVICE_TYPE_CARKIT = "Carkit";



    /**

     * Device type which is used in METADATA_DEVICE_TYPE

     * Indicates this Bluetooth device is a HearingAid.

     *

     * @hide

     */

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

    @SystemApi

    public static final String DEVICE_TYPE_HEARING_AID = "HearingAid";



    /**

     * Broadcast Action: This intent is used to broadcast the {@link UUID}

     * wrapped as a {@link android.os.ParcelUuid} of the remote device after it