diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-23 05:19:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-23 05:19:51 +0000 |
| commit | 2f52d18c6a1cf0a2005dc53eb87a1886d629d071 (patch) | |
| tree | 997fe07d37e0e7fa3407666f15a77ff63437def8 /framework/java/android/bluetooth/BluetoothDevice.java | |
| parent | 46473ddb1f93158b542b0d0e353c3d8fba035e5d (diff) | |
| parent | 20756a9aa94db77154d12e9bbeb4e4887dcd8132 (diff) | |
Merge "More metadata for spatial audio and fast pair" am: 81a78d9f3e am: 20756a9aa9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1998179
Change-Id: I71e82340e180d9960e44e6c18f8ff5d0d9e94227
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothDevice.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothDevice.java | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothDevice.java b/framework/java/android/bluetooth/BluetoothDevice.java index ddf2390e53..3040b51ce0 100644 --- a/framework/java/android/bluetooth/BluetoothDevice.java +++ b/framework/java/android/bluetooth/BluetoothDevice.java @@ -496,7 +496,9 @@ public final class BluetoothDevice implements Parcelable, Attributable { METADATA_MAIN_LOW_BATTERY_THRESHOLD, METADATA_UNTETHERED_LEFT_LOW_BATTERY_THRESHOLD, METADATA_UNTETHERED_RIGHT_LOW_BATTERY_THRESHOLD, - METADATA_UNTETHERED_CASE_LOW_BATTERY_THRESHOLD}) + METADATA_UNTETHERED_CASE_LOW_BATTERY_THRESHOLD, + METADATA_SPATIAL_AUDIO, + METADATA_FAST_PAIR_CUSTOMIZED_FIELDS}) @Retention(RetentionPolicy.SOURCE) public @interface MetadataKey{} @@ -706,6 +708,21 @@ public final class BluetoothDevice implements Parcelable, Attributable { @SystemApi public static final int METADATA_UNTETHERED_CASE_LOW_BATTERY_THRESHOLD = 23; + + /** + * The metadata of the audio spatial data. + * Data type should be {@link Byte} array. + * @hide + */ + public static final int METADATA_SPATIAL_AUDIO = 24; + + /** + * The metadata of the Fast Pair for any custmized feature. + * Data type should be {@link Byte} array. + * @hide + */ + public static final int METADATA_FAST_PAIR_CUSTOMIZED_FIELDS = 25; + /** * Device type which is used in METADATA_DEVICE_TYPE * Indicates this Bluetooth device is a standard Bluetooth accessory or @@ -3191,7 +3208,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { * @hide */ public static @MetadataKey int getMaxMetadataKey() { - return METADATA_UNTETHERED_CASE_LOW_BATTERY_THRESHOLD; + return METADATA_FAST_PAIR_CUSTOMIZED_FIELDS; } /** |