commit 7f0ce21dba1254dd8689d1429cf0bdac4a1e84ff
author Eric Arseneau <earseneau@google.com> Fri Nov 15 14:25:36 2019 -0800
committer Eric Arseneau <earseneau@google.com> Fri Nov 15 14:25:36 2019 -0800
tree 35a85de12ed2562bcd3342d39ea3394291c58b11
parent e94dcf8dd01a0786a5138e4845d812d0e119b3ac
parent be6ecb1844a4e99c568728f3c9b36452f070fbbc

Merge android10-release

Change-Id: Ife306d9e5b6d489172a47a55f3b0cd20aee4c40d

src/com/android/bluetooth/btservice/AdapterService.java

diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 277eb8c..5bec2d0 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -2620,6 +2620,12 @@
             return false;
         }
 
+        if (pinCode.length != len) {
+            android.util.EventLog.writeEvent(0x534e4554, "139287605", -1,
+                    "PIN code length mismatch");
+            return false;
+        }
+
         StatsLog.write(StatsLog.BLUETOOTH_BOND_STATE_CHANGED,
                 obfuscateAddress(device), 0, device.getType(),
                 BluetoothDevice.BOND_BONDING,
@@ -2636,6 +2642,12 @@
             return false;
         }
 
+        if (passkey.length != len) {
+            android.util.EventLog.writeEvent(0x534e4554, "139287605", -1,
+                    "Passkey length mismatch");
+            return false;
+        }
+
         StatsLog.write(StatsLog.BLUETOOTH_BOND_STATE_CHANGED,
                 obfuscateAddress(device), 0, device.getType(),
                 BluetoothDevice.BOND_BONDING,