summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothUuid.java
diff options
context:
space:
mode:
authorKim Schulz <k.schulz@samsung.com>2013-08-22 11:18:02 +0200
committerZhihai Xu <zhihaixu@google.com>2013-09-12 19:07:28 -0700
commit6816ee2b6d6820a727b59d78b6892473efd42f98 (patch)
tree512f96f87417589873acc512bcb4a6e4c94a7b5b /framework/java/android/bluetooth/BluetoothUuid.java
parent008ce9e07b5e58c5ab31c5d73ec3d1ad1a6cf605 (diff)
Fixed review comments
- fixed review comments (internal+google) - corrected tabs/spaces - Add connection id header for obex client operations - added support for implementing ProfileService class Change-Id: Idab8b4fa54a0f31bec4ffa263a69a9850a07f858 Bug:10692365
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothUuid.java')
-rw-r--r--framework/java/android/bluetooth/BluetoothUuid.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothUuid.java b/framework/java/android/bluetooth/BluetoothUuid.java
index 6609b988b2..abdf949ebc 100644
--- a/framework/java/android/bluetooth/BluetoothUuid.java
+++ b/framework/java/android/bluetooth/BluetoothUuid.java
@@ -67,13 +67,16 @@ public final class BluetoothUuid {
public static final ParcelUuid PBAP_PSE =
ParcelUuid.fromString("0000112f-0000-1000-8000-00805F9B34FB");
public static final ParcelUuid MAP =
- ParcelUuid.fromString("00001132-0000-1000-8000-00805F9B34FB");
+ ParcelUuid.fromString("00001134-0000-1000-8000-00805F9B34FB");
public static final ParcelUuid MNS =
ParcelUuid.fromString("00001133-0000-1000-8000-00805F9B34FB");
+ public static final ParcelUuid MAS =
+ ParcelUuid.fromString("00001132-0000-1000-8000-00805F9B34FB");
+
public static final ParcelUuid[] RESERVED_UUIDS = {
AudioSink, AudioSource, AdvAudioDist, HSP, Handsfree, AvrcpController, AvrcpTarget,
- ObexObjectPush, PANU, NAP, MAP, MNS};
+ ObexObjectPush, PANU, NAP, MAP, MNS, MAS};
public static boolean isAudioSource(ParcelUuid uuid) {
return uuid.equals(AudioSource);
@@ -124,6 +127,9 @@ public final class BluetoothUuid {
public static boolean isMns(ParcelUuid uuid) {
return uuid.equals(MNS);
}
+ public static boolean isMas(ParcelUuid uuid) {
+ return uuid.equals(MAS);
+ }
/**
* Returns true if ParcelUuid is present in uuidArray