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

Commit 74783c95 authored by Alice Kuo's avatar Alice Kuo Committed by Automerger Merge Worker
Browse files

Merge "csip: Expose an extra data with intent and store in... 

Merge "csip: Expose an extra data with intent and store in CachedBluetoothDevice" into stage-aosp-master am: cc3fb6dd85 am: 2266ac7b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15849150

Change-Id: I8301dc561798f50310d5524f6784a76811009601
parents a119c966 2266ac7b

framework/java/android/bluetooth/BluetoothDevice.java

+10 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
     * <p>Sent when a remote device is found during discovery.

     * <p>Always contains the extra fields {@link #EXTRA_DEVICE} and {@link

     * #EXTRA_CLASS}. Can contain the extra fields {@link #EXTRA_NAME} and/or

     * {@link #EXTRA_RSSI} if they are available.

     * {@link #EXTRA_RSSI} and/or {@link #EXTRA_IS_COORDINATED_SET_MEMBER} if they are available.

     */

    // TODO: Change API to not broadcast RSSI if not available (incoming connection)

    @RequiresLegacyBluetoothPermission
@@ -278,6 +278,15 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
     */

    public static final String EXTRA_RSSI = "android.bluetooth.device.extra.RSSI";



    /**

    * Used as an bool extra field in {@link #ACTION_FOUND} intents.

    * It contains the information if device is discovered as member of a coordinated set or not.

    * Pairing with device that belongs to a set would trigger pairing with the rest of set members.

    * See Bluetooth CSIP specification for more details.

    */

    public static final String EXTRA_IS_COORDINATED_SET_MEMBER =

            "android.bluetooth.extra.IS_COORDINATED_SET_MEMBER";



    /**

     * Used as a Parcelable {@link BluetoothClass} extra field in {@link

     * #ACTION_FOUND} and {@link #ACTION_CLASS_CHANGED} intents.