diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-07-21 12:08:12 -0700 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2010-07-21 12:08:12 -0700 |
| commit | 05a1863cebcc8e318283f3f4a49ba69d83b62866 (patch) | |
| tree | f38becab191d8941df5eeea5f67ed72f7dfab79a /core/java/android/server | |
| parent | de07503a382e81ba82f4cd4dee81ff2fbf3295bc (diff) | |
| download | frameworks_base-05a1863cebcc8e318283f3f4a49ba69d83b62866.zip frameworks_base-05a1863cebcc8e318283f3f4a49ba69d83b62866.tar.gz frameworks_base-05a1863cebcc8e318283f3f4a49ba69d83b62866.tar.bz2 | |
Allow multiple HID devices to be connected.
Change-Id: I40d9820b756c1e3bb4e773fbb78212e2716e99bf
Diffstat (limited to 'core/java/android/server')
| -rw-r--r-- | core/java/android/server/BluetoothService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index 68eba6e..acfc0d7 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -1240,7 +1240,8 @@ public class BluetoothService extends IBluetooth.Stub { "Need BLUETOOTH_ADMIN permission"); String objectPath = getObjectPathFromAddress(device.getAddress()); - if (objectPath == null || getConnectedInputDevices().length != 0 || + if (objectPath == null || + getInputDeviceState(device) != BluetoothInputDevice.STATE_DISCONNECTED || getInputDevicePriority(device) == BluetoothInputDevice.PRIORITY_OFF) { return false; } |