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

Commit 0e3531b2 authored by Yiyi Shen's avatar Yiyi Shen Committed by Automerger Merge Worker
Browse files

Merge "Add @SystemApi device type metadata key for speakers and headsets."... 

Merge "Add @SystemApi device type metadata key for speakers and headsets." into main am: c5cc97ce am: 0b852463

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2813984



Change-Id: I41b54d3779b296aeafd8b284df0c1c2b4b507f66
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 744b8ad5 0b852463

flags/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ aconfig_declarations { 
    srcs: [

        "a2dp.aconfig",

        "audio_routing.aconfig",

        "framework.aconfig",

        "gap.aconfig",

        "gatt.aconfig",

        "hap.aconfig",

flags/framework.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"



flag {

    name: "support_metadata_device_types_apis"

    namespace: "bluetooth"

    description: "Support more device types in bt device metadata"

    bug: "289584302"

}

framework/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -219,6 +219,8 @@ 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 @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_SPEAKER = "Speaker";

    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";

framework/java/android/bluetooth/BluetoothDevice.java

+21 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.bluetooth; 


import static android.bluetooth.BluetoothUtils.getSyncTimeout;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;
@@ -836,6 +837,26 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
    @SystemApi

    public static final String DEVICE_TYPE_STYLUS = "Stylus";



    /**

     * Device type which is used in METADATA_DEVICE_TYPE

     * Indicates this Bluetooth device is a speaker.

     *

     * @hide

     */

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

    @SystemApi

    public static final String DEVICE_TYPE_SPEAKER = "Speaker";



    /**

     * Device type which is used in METADATA_DEVICE_TYPE

     * Indicates this Bluetooth device is a tethered headset.

     *

     * @hide

     */

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

    @SystemApi

    public static final String DEVICE_TYPE_HEADSET = "Headset";



    /**

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

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