Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UUID typo and allow incoming AVRCP connections.

Browse Source
This commit is contained in:
Jaikumar Ganesh
2009-07-30 13:32:25 -07:00
parent 0ba3cfaa56
commit ade40526c8
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/bluetooth/BluetoothUuid.java
View File

@@ -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);
}
}

7
core/java/android/server/BluetoothEventLoop.java
View File

@@ -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);