From ac6f13dc68dadb59fcad1df4af478bf0955e6e87 Mon Sep 17 00:00:00 2001 From: Jaikumar Ganesh Date: Wed, 12 Jan 2011 10:08:57 -0800 Subject: [PATCH] Revert "Add temporary hack for keyboards not following spec." This reverts commit 8cc316e4f4458725f78b2b7ebde2f780f9b8447b. --- .../android/server/BluetoothEventLoop.java | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index ae729d2d586fc..ebe7d32361b20 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -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);