diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-07-30 13:32:25 -0700 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2009-07-31 10:33:47 -0700 |
| commit | ade40526c899caf9369652f9481634a6232ec022 (patch) | |
| tree | 359391b96ee95d9938de377bbea18e4cc645b125 /core | |
| parent | 0ba3cfaa5664873398f17b934c18928f3c0c7984 (diff) | |
| download | frameworks_base-ade40526c899caf9369652f9481634a6232ec022.zip frameworks_base-ade40526c899caf9369652f9481634a6232ec022.tar.gz frameworks_base-ade40526c899caf9369652f9481634a6232ec022.tar.bz2 | |
Fix UUID typo and allow incoming AVRCP connections.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothUuid.java | 18 | ||||
| -rw-r--r-- | core/java/android/server/BluetoothEventLoop.java | 7 |
2 files changed, 14 insertions, 11 deletions
diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java index f8316a5..1ec7fb3 100644 --- a/core/java/android/bluetooth/BluetoothUuid.java +++ b/core/java/android/bluetooth/BluetoothUuid.java @@ -30,14 +30,13 @@ public final class BluetoothUuid { * The following 128 bit values are calculated as: * uuid * 2^96 + BASE_UUID */ - public static final UUID AudioSink = UUID.fromString("0000110A-0000-1000-8000-00805F9B34FB"); - public static final UUID AudioSource = UUID.fromString("0000110B-0000-1000-8000-00805F9B34FB"); + public static final UUID AudioSink = UUID.fromString("0000110B-0000-1000-8000-00805F9B34FB"); + public static final UUID AudioSource = UUID.fromString("0000110A-0000-1000-8000-00805F9B34FB"); public static final UUID AdvAudioDist = UUID.fromString("0000110D-0000-1000-8000-00805F9B34FB"); public static final UUID HSP = UUID.fromString("00001108-0000-1000-8000-00805F9B34FB"); - public static final UUID HeadsetHS = UUID.fromString("00001131-0000-1000-8000-00805F9B34FB"); - public static final UUID Handsfree = UUID.fromString("0000111e-0000-1000-8000-00805F9B34FB"); - public static final UUID HandsfreeAudioGateway - = UUID.fromString("0000111f-0000-1000-8000-00805F9B34FB"); + public static final UUID Handsfree = UUID.fromString("0000111E-0000-1000-8000-00805F9B34FB"); + public static final UUID AvrcpController = + UUID.fromString("0000110E-0000-1000-8000-00805F9B34FB"); public static boolean isAudioSource(UUID uuid) { return uuid.equals(AudioSource); @@ -56,7 +55,10 @@ public final class BluetoothUuid { } public static boolean isHeadset(UUID uuid) { - return uuid.equals(HSP) || uuid.equals(HeadsetHS); + return uuid.equals(HSP); } -} + public static boolean isAvrcpController(UUID uuid) { + return uuid.equals(AvrcpController); + } +} diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index dc84d1f..d982777 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -402,13 +402,14 @@ class BluetoothEventLoop { boolean authorized = false; UUID uuid = UUID.fromString(deviceUuid); - if (mBluetoothService.isEnabled() && BluetoothUuid.isAudioSink(uuid)) { + if (mBluetoothService.isEnabled() && + (BluetoothUuid.isAudioSink(uuid) || BluetoothUuid.isAvrcpController(uuid))) { BluetoothA2dp a2dp = new BluetoothA2dp(mContext); authorized = a2dp.getSinkPriority(address) > BluetoothA2dp.PRIORITY_OFF; if (authorized) { - Log.i(TAG, "Allowing incoming A2DP connection from " + address); + Log.i(TAG, "Allowing incoming A2DP / AVRCP connection from " + address); } else { - Log.i(TAG, "Rejecting incoming A2DP connection from " + address); + Log.i(TAG, "Rejecting incoming A2DP / AVRCP connection from " + address); } } else { Log.i(TAG, "Rejecting incoming " + deviceUuid + " connection from " + address); |