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

Commit 35e5511a authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "BondStateMachine: Fix BluetoothClass being null" into main am: 062951ee am: 4328fae5 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2734170



Change-Id: I24c9269f8001334b22021bd3365ea45934884cb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a2f3eeb 4328fae5

android/app/src/com/android/bluetooth/btservice/BondStateMachine.java

+4 −3
Original line number Diff line number Diff line
@@ -273,8 +273,9 @@ final class BondStateMachine extends StateMachine { 
                    }



                    BluetoothClass btClass = dev.getBluetoothClass();

                    int btDeviceClass = btClass.getDeviceClass();

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

                    int btDeviceClass = btClass == null ? 0 : btClass.getDeviceClass();

                    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. If the keyboard doesn't follow