commit d67ce9f8ca5ef4b70f7f6db9eba3e301b89dccc0
author William Escande <wescande@google.com> Wed Aug 30 18:18:00 2023 -0700
committer William Escande <wescande@google.com> Thu Aug 31 05:11:59 2023 +0000
tree a08670c8282fe550fd7dae7495e7e69b23f5d3a0
parent 0387ae9d44f2b3bca8f71997e30c54a5c163ff19

BondStateMachine: Fix BluetoothClass being null

Bug: 298149530
Test: atest BondStateMachineTest | This happen as a race condition
      during stack shutdown and cannot be easily test. Fix is trivial
Change-Id: I41e82064a5cca1639fdf57696745ad4e53d50877

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

diff --git a/android/app/src/com/android/bluetooth/btservice/BondStateMachine.java b/android/app/src/com/android/bluetooth/btservice/BondStateMachine.java
index 75433b2..d565a9c 100644
--- a/android/app/src/com/android/bluetooth/btservice/BondStateMachine.java
+++ b/android/app/src/com/android/bluetooth/btservice/BondStateMachine.java
@@ -273,9 +273,10 @@
                     }
 
                     BluetoothClass btClass = dev.getBluetoothClass();
-                    int btDeviceClass = btClass.getDeviceClass();
-                    if (btDeviceClass == BluetoothClass.Device.PERIPHERAL_KEYBOARD || btDeviceClass
-                            == BluetoothClass.Device.PERIPHERAL_KEYBOARD_POINTING) {
+                    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
                         // the spec recommendation, check if the keyboard has a fixed PIN zero