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

Commit 5bf94edd authored by Vania Januar's avatar Vania Januar Committed by Gerrit Code Review
Browse files

Merge "New @SystemApi device type metadata key."

parents 69cafe49 663ac050

framework/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ package android.bluetooth { 
    field public static final int CONNECTION_ACCESS_NO = 2; // 0x2

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

    field public static final String DEVICE_TYPE_DEFAULT = "Default";

    field public static final String DEVICE_TYPE_STYLUS = "Stylus";

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

    field public static final String DEVICE_TYPE_WATCH = "Watch";

    field public static final String EXTRA_ACCESS_REQUEST_TYPE = "android.bluetooth.device.extra.ACCESS_REQUEST_TYPE";

framework/java/android/bluetooth/BluetoothDevice.java

+8 −0
Original line number Diff line number Diff line
@@ -769,6 +769,14 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @SystemApi

    public static final String DEVICE_TYPE_UNTETHERED_HEADSET = "Untethered Headset";



    /**

     * Device type which is used in METADATA_DEVICE_TYPE

     * Indicates this Bluetooth device is a stylus.

     * @hide

     */

    @SystemApi

    public static final String DEVICE_TYPE_STYLUS = "Stylus";



    /**

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

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