commit fc2c55c49653fdb904e2825bea6fdbf0be11ae9d
author electimon <electi@yzu.moe> Sat Mar 15 00:06:42 2025 +0000
committer Michael Bestas <mkbestas@lineageos.org> Mon Mar 17 07:44:06 2025 +0000
tree 24961c9ee60f8909902a22370792cb3ad1fd1afe
parent bdeabdb3df081a89c8b452a4b71af2e4865758d2

BondStateMachine: Check name for validity before access

test: Bluetooth LE Secure Client/Server CTS-V pass
Change-Id: I172ceac51d14a27bb50e3249516c8a4b0be7198d
Signed-off-by: electimon <electi@yzu.moe>

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 380c0f5..233a9d8 100644
--- a/android/app/src/com/android/bluetooth/btservice/BondStateMachine.java
+++ b/android/app/src/com/android/bluetooth/btservice/BondStateMachine.java
@@ -499,7 +499,11 @@
     @RequiresPermission(BLUETOOTH_CONNECT)
     private boolean isSkipConfirmationAccessory(BluetoothDevice device) {
         for (Pair<String, Integer> entry : accConfirmSkip) {
-            if (device.getName().equals(entry.first)
+            String name = device.getName();
+            if (name == null) {
+                return false;
+            }
+            if (name.equals(entry.first)
                     && device.getBluetoothClass().getDeviceClass() == entry.second) {
                 return true;
             }