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

am fc019bd4: Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb

Browse Source 
* commit 'fc019bd4fa3004ec8e287fee0d277db666891ca3':
  Revert "Add temporary hack for keyboards not following spec."
This commit is contained in:
Jaikumar Ganesh
2011-01-12 12:24:57 -08:00
committed by Android Git Automerger
parent 6fcaec5076 fc019bd4fa
commit 5e2f9db3f1
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -548,26 +548,15 @@ class BluetoothEventLoop {
}
}
// STOPSHIP: Hack for MOT keyboards
boolean motKeyboard = false;
String name = mBluetoothService.getRemoteName(address);
if (name == null && address.startsWith("00:0F:F6") ||
(name != null && name.startsWith("Motorola"))) {
motKeyboard = true;
if (btDeviceClass == BluetoothClass.Device.PERIPHERAL_KEYBOARD ||
btDeviceClass == BluetoothClass.Device.PERIPHERAL_KEYBOARD_POINTING) {
// Its a keyboard. Follow the HID spec recommendation of creating the
// passkey and displaying it to the user.
// Generate a variable PIN. This is not truly random but good enough.
int pin = (int) Math.floor(Math.random() * 10000);
sendDisplayPinIntent(address, pin);
return;
}
if (!motKeyboard) {
if (btDeviceClass == BluetoothClass.Device.PERIPHERAL_KEYBOARD ||
btDeviceClass == BluetoothClass.Device.PERIPHERAL_KEYBOARD_POINTING) {
// Its a keyboard. Follow the HID spec recommendation of creating the
// passkey and displaying it to the user.
// Generate a variable PIN. This is not truly random but good enough.
int pin = (int) Math.floor(Math.random() * 10000);
sendDisplayPinIntent(address, pin);
return;
}
}
// Acquire wakelock during PIN code request to bring up LCD display
mWakeLock.acquire();
Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_REQUEST);