Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a107eaff authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android (Google) Code Review
Browse files

Merge "Add temporary hack for keyboards not following spec." into honeycomb

parents ed1b2a27 8cc316e4

core/java/android/server/BluetoothEventLoop.java

+19 −8
Original line number Diff line number Diff line
@@ -548,6 +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 (!motKeyboard) {

            if (btDeviceClass == BluetoothClass.Device.PERIPHERAL_KEYBOARD ||

                btDeviceClass == BluetoothClass.Device.PERIPHERAL_KEYBOARD_POINTING) {

                // Its a keyboard. Follow the HID spec recommendation of creating the
@@ -557,6 +566,8 @@ class BluetoothEventLoop { 
                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);