From b23d4458a91c8e77828fc38ffd81914c2e37d43a Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Wed, 26 Aug 2009 09:33:40 -0700 Subject: [PATCH] Fix authorization check for Audio Source. Bluez sends the UUID of the local service being accessed in Agent.Authorize, not the remote service. So check for Audio Source not Audio Sink. In most cases this was not a problem because Bluez sends us AdvAudioDist UUID (0x110D) for incoming A2DP connections, which we already check for. This is a precautionary change. --- core/java/android/server/BluetoothEventLoop.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index 34d6d03aabd5e..975c2ffc38b7f 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -430,8 +430,10 @@ class BluetoothEventLoop { boolean authorized = false; UUID uuid = UUID.fromString(deviceUuid); + // Bluez sends the UUID of the local service being accessed, _not_ the + // remote service if (mBluetoothService.isEnabled() && - (BluetoothUuid.isAudioSink(uuid) || BluetoothUuid.isAvrcpTarget(uuid) + (BluetoothUuid.isAudioSource(uuid) || BluetoothUuid.isAvrcpTarget(uuid) || BluetoothUuid.isAdvAudioDist(uuid))) { BluetoothA2dp a2dp = new BluetoothA2dp(mContext); BluetoothDevice device = mAdapter.getRemoteDevice(address); @@ -444,6 +446,7 @@ class BluetoothEventLoop { } else { Log.i(TAG, "Rejecting incoming " + deviceUuid + " connection from " + address); } + log("onAgentAuthorize(" + objectPath + ", " + deviceUuid + ") = " + authorized); return authorized; }